6848 files changed, 18 insertions, 17 deletions

diff --git a/ubuntu/maverick/applications/abakus/debian/abakus-trinity.manpages b/ubuntu/_base/applications/abakus/debian/abakus-trinity.manpages
index 0737a321e..0737a321e 100644
--- a/ubuntu/maverick/applications/abakus/debian/abakus-trinity.manpages
+++ b/ubuntu/_base/applications/abakus/debian/abakus-trinity.manpages
diff --git a/ubuntu/maverick/applications/abakus/debian/abakus-trinity.menu b/ubuntu/_base/applications/abakus/debian/abakus-trinity.menu
index 8c20bfd19..8c20bfd19 100644
--- a/ubuntu/maverick/applications/abakus/debian/abakus-trinity.menu
+++ b/ubuntu/_base/applications/abakus/debian/abakus-trinity.menu
diff --git a/ubuntu/maverick/applications/abakus/debian/abakus.1 b/ubuntu/_base/applications/abakus/debian/abakus.1
index 1411beebd..1411beebd 100644
--- a/ubuntu/maverick/applications/abakus/debian/abakus.1
+++ b/ubuntu/_base/applications/abakus/debian/abakus.1
diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/abakus/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/abakus/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk b/ubuntu/_base/applications/abakus/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/abakus/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/versions.pl b/ubuntu/_base/applications/abakus/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/abakus/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/abakus/debian/changelog b/ubuntu/_base/applications/abakus/debian/changelog
index 4bca3dc33..4bca3dc33 100644
--- a/ubuntu/maverick/applications/abakus/debian/changelog
+++ b/ubuntu/_base/applications/abakus/debian/changelog
diff --git a/ubuntu/maverick/applications/abakus/debian/compat b/ubuntu/_base/applications/abakus/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/abakus/debian/compat
+++ b/ubuntu/_base/applications/abakus/debian/compat
diff --git a/ubuntu/maverick/applications/abakus/debian/control b/ubuntu/_base/applications/abakus/debian/control
index bc15339c6..bc15339c6 100644
--- a/ubuntu/maverick/applications/abakus/debian/control
+++ b/ubuntu/_base/applications/abakus/debian/control
diff --git a/ubuntu/maverick/applications/abakus/debian/copyright b/ubuntu/_base/applications/abakus/debian/copyright
index 5d11ec083..5d11ec083 100644
--- a/ubuntu/maverick/applications/abakus/debian/copyright
+++ b/ubuntu/_base/applications/abakus/debian/copyright
diff --git a/ubuntu/maverick/applications/abakus/debian/docs b/ubuntu/_base/applications/abakus/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/abakus/debian/docs
+++ b/ubuntu/_base/applications/abakus/debian/docs
diff --git a/ubuntu/maverick/applications/abakus/debian/patches/series b/ubuntu/_base/applications/abakus/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/abakus/debian/patches/series
+++ b/ubuntu/_base/applications/abakus/debian/patches/series
diff --git a/ubuntu/maverick/applications/abakus/debian/rules b/ubuntu/_base/applications/abakus/debian/rules
index 7f037b23e..7f037b23e 100755
--- a/ubuntu/maverick/applications/abakus/debian/rules
+++ b/ubuntu/_base/applications/abakus/debian/rules
diff --git a/ubuntu/maverick/applications/abakus/debian/source/format b/ubuntu/_base/applications/abakus/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/abakus/debian/source/format
+++ b/ubuntu/_base/applications/abakus/debian/source/format
diff --git a/ubuntu/maverick/applications/abakus/debian/source/options b/ubuntu/_base/applications/abakus/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/abakus/debian/source/options
+++ b/ubuntu/_base/applications/abakus/debian/source/options
diff --git a/ubuntu/maverick/applications/adept/debian/adept-batch-trinity.install b/ubuntu/_base/applications/adept/debian/adept-batch-trinity.install
index 7f2ac31a4..7f2ac31a4 100644
--- a/ubuntu/maverick/applications/adept/debian/adept-batch-trinity.install
+++ b/ubuntu/_base/applications/adept/debian/adept-batch-trinity.install
diff --git a/ubuntu/maverick/applications/adept/debian/adept-common-trinity.install b/ubuntu/_base/applications/adept/debian/adept-common-trinity.install
index 535c10c7d..535c10c7d 100644
--- a/ubuntu/maverick/applications/adept/debian/adept-common-trinity.install
+++ b/ubuntu/_base/applications/adept/debian/adept-common-trinity.install
diff --git a/ubuntu/maverick/applications/adept/debian/adept-installer-trinity.install b/ubuntu/_base/applications/adept/debian/adept-installer-trinity.install
index b1d5914e1..b1d5914e1 100644
--- a/ubuntu/maverick/applications/adept/debian/adept-installer-trinity.install
+++ b/ubuntu/_base/applications/adept/debian/adept-installer-trinity.install
diff --git a/ubuntu/maverick/applications/adept/debian/adept-manager-trinity.install b/ubuntu/_base/applications/adept/debian/adept-manager-trinity.install
index f5f2446e7..f5f2446e7 100644
--- a/ubuntu/maverick/applications/adept/debian/adept-manager-trinity.install
+++ b/ubuntu/_base/applications/adept/debian/adept-manager-trinity.install
diff --git a/ubuntu/maverick/applications/adept/debian/adept-notifier-trinity.install b/ubuntu/_base/applications/adept/debian/adept-notifier-trinity.install
index e221e4ac3..e221e4ac3 100644
--- a/ubuntu/maverick/applications/adept/debian/adept-notifier-trinity.install
+++ b/ubuntu/_base/applications/adept/debian/adept-notifier-trinity.install
diff --git a/ubuntu/maverick/applications/adept/debian/adept-updater-trinity.install b/ubuntu/_base/applications/adept/debian/adept-updater-trinity.install
index ba854f2a8..ba854f2a8 100644
--- a/ubuntu/maverick/applications/adept/debian/adept-updater-trinity.install
+++ b/ubuntu/_base/applications/adept/debian/adept-updater-trinity.install
diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/adept/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/adept/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk b/ubuntu/_base/applications/adept/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/adept/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/versions.pl b/ubuntu/_base/applications/adept/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/adept/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/adept/debian/changelog b/ubuntu/_base/applications/adept/debian/changelog
index 332ec5674..332ec5674 100644
--- a/ubuntu/maverick/applications/adept/debian/changelog
+++ b/ubuntu/_base/applications/adept/debian/changelog
diff --git a/ubuntu/maverick/applications/adept/debian/compat b/ubuntu/_base/applications/adept/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/adept/debian/compat
+++ b/ubuntu/_base/applications/adept/debian/compat
diff --git a/ubuntu/maverick/applications/adept/debian/control b/ubuntu/_base/applications/adept/debian/control
index a6d760478..a6d760478 100644
--- a/ubuntu/maverick/applications/adept/debian/control
+++ b/ubuntu/_base/applications/adept/debian/control
diff --git a/ubuntu/maverick/applications/adept/debian/copyright b/ubuntu/_base/applications/adept/debian/copyright
index 6f8ad6648..6f8ad6648 100644
--- a/ubuntu/maverick/applications/adept/debian/copyright
+++ b/ubuntu/_base/applications/adept/debian/copyright
diff --git a/ubuntu/maverick/applications/adept/debian/dirs b/ubuntu/_base/applications/adept/debian/dirs
index 73752c9ae..73752c9ae 100644
--- a/ubuntu/maverick/applications/adept/debian/dirs
+++ b/ubuntu/_base/applications/adept/debian/dirs
diff --git a/ubuntu/maverick/applications/adept/debian/docs b/ubuntu/_base/applications/adept/debian/docs
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/adept/debian/docs
+++ b/ubuntu/_base/applications/adept/debian/docs
diff --git a/ubuntu/maverick/applications/adept/debian/patches/series b/ubuntu/_base/applications/adept/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/adept/debian/patches/series
+++ b/ubuntu/_base/applications/adept/debian/patches/series
diff --git a/ubuntu/maverick/applications/adept/debian/rules b/ubuntu/_base/applications/adept/debian/rules
index c51a46292..c51a46292 100755
--- a/ubuntu/maverick/applications/adept/debian/rules
+++ b/ubuntu/_base/applications/adept/debian/rules
diff --git a/ubuntu/maverick/applications/adept/debian/source/format b/ubuntu/_base/applications/adept/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/adept/debian/source/format
+++ b/ubuntu/_base/applications/adept/debian/source/format
diff --git a/ubuntu/maverick/applications/adept/debian/source/options b/ubuntu/_base/applications/adept/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/adept/debian/source/options
+++ b/ubuntu/_base/applications/adept/debian/source/options
diff --git a/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 447fe40dc..447fe40dc 100644
--- a/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/applications/amarok/debian/README.Debian b/ubuntu/_base/applications/amarok/debian/README.Debian
index 8a407f9c1..8a407f9c1 100644
--- a/ubuntu/maverick/applications/amarok/debian/README.Debian
+++ b/ubuntu/_base/applications/amarok/debian/README.Debian
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-common-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install
index 3b473baa0..3b473baa0 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-common-trinity.install
+++ b/ubuntu/_base/applications/amarok/debian/amarok-common-trinity.install
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-engine-xine-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-engine-xine-trinity.install
index c5e46604f..c5e46604f 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-engine-xine-trinity.install
+++ b/ubuntu/_base/applications/amarok/debian/amarok-engine-xine-trinity.install
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-engine-yauap-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install
index ab71ca6f9..ab71ca6f9 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-engine-yauap-trinity.install
+++ b/ubuntu/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/amarok/debian/amarok-trinity.install
index f66beb7cf..f66beb7cf 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.install
+++ b/ubuntu/_base/applications/amarok/debian/amarok-trinity.install
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.manpages b/ubuntu/_base/applications/amarok/debian/amarok-trinity.manpages
index 8094eebb9..8094eebb9 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.manpages
+++ b/ubuntu/_base/applications/amarok/debian/amarok-trinity.manpages
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu b/ubuntu/_base/applications/amarok/debian/amarok-trinity.menu
index 2e66f42b2..2e66f42b2 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu
+++ b/ubuntu/_base/applications/amarok/debian/amarok-trinity.menu
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok_play_audiocd.desktop b/ubuntu/_base/applications/amarok/debian/amarok_play_audiocd.desktop
index 6126d7b4b..6126d7b4b 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok_play_audiocd.desktop
+++ b/ubuntu/_base/applications/amarok/debian/amarok_play_audiocd.desktop
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/amarok/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/amarok/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk b/ubuntu/_base/applications/amarok/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/amarok/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/versions.pl b/ubuntu/_base/applications/amarok/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/amarok/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/amarok/debian/changelog b/ubuntu/_base/applications/amarok/debian/changelog
index e7875b1a8..e7875b1a8 100644
--- a/ubuntu/maverick/applications/amarok/debian/changelog
+++ b/ubuntu/_base/applications/amarok/debian/changelog
diff --git a/ubuntu/maverick/applications/amarok/debian/compat b/ubuntu/_base/applications/amarok/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/amarok/debian/compat
+++ b/ubuntu/_base/applications/amarok/debian/compat
diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/_base/applications/amarok/debian/control
index 82cbff77b..82cbff77b 100644
--- a/ubuntu/maverick/applications/amarok/debian/control
+++ b/ubuntu/_base/applications/amarok/debian/control
diff --git a/ubuntu/maverick/applications/amarok/debian/copyright b/ubuntu/_base/applications/amarok/debian/copyright
index 2775890ba..2775890ba 100644
--- a/ubuntu/maverick/applications/amarok/debian/copyright
+++ b/ubuntu/_base/applications/amarok/debian/copyright
diff --git a/ubuntu/maverick/applications/amarok/debian/icons/amarok-16.xpm b/ubuntu/_base/applications/amarok/debian/icons/amarok-16.xpm
index 80a228f20..80a228f20 100644
--- a/ubuntu/maverick/applications/amarok/debian/icons/amarok-16.xpm
+++ b/ubuntu/_base/applications/amarok/debian/icons/amarok-16.xpm
diff --git a/ubuntu/maverick/applications/amarok/debian/icons/amarok.xpm b/ubuntu/_base/applications/amarok/debian/icons/amarok.xpm
index 6411e36d0..6411e36d0 100644
--- a/ubuntu/maverick/applications/amarok/debian/icons/amarok.xpm
+++ b/ubuntu/_base/applications/amarok/debian/icons/amarok.xpm
diff --git a/ubuntu/maverick/applications/amarok/debian/install-mp3 b/ubuntu/_base/applications/amarok/debian/install-mp3
index ae0663182..ae0663182 100644
--- a/ubuntu/maverick/applications/amarok/debian/install-mp3
+++ b/ubuntu/_base/applications/amarok/debian/install-mp3
diff --git a/ubuntu/maverick/applications/amarok/debian/kubuntu-media-amarok b/ubuntu/_base/applications/amarok/debian/kubuntu-media-amarok
index dacf7fc55..dacf7fc55 100644
--- a/ubuntu/maverick/applications/amarok/debian/kubuntu-media-amarok
+++ b/ubuntu/_base/applications/amarok/debian/kubuntu-media-amarok
diff --git a/ubuntu/maverick/applications/amarok/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/amarok/debian/man/amarok-trinity.1
index 821ec48c7..821ec48c7 100644
--- a/ubuntu/maverick/applications/amarok/debian/man/amarok-trinity.1
+++ b/ubuntu/_base/applications/amarok/debian/man/amarok-trinity.1
diff --git a/ubuntu/maverick/applications/amarok/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1
index c932b9b0c..c932b9b0c 100644
--- a/ubuntu/maverick/applications/amarok/debian/man/amarok_libvisual-trinity.1
+++ b/ubuntu/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1
diff --git a/ubuntu/maverick/applications/amarok/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/amarok/debian/man/amarokapp-trinity.1
index 91ff8b6aa..91ff8b6aa 100644
--- a/ubuntu/maverick/applications/amarok/debian/man/amarokapp-trinity.1
+++ b/ubuntu/_base/applications/amarok/debian/man/amarokapp-trinity.1
diff --git a/ubuntu/maverick/applications/amarok/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
index c67cd917f..c67cd917f 100644
--- a/ubuntu/maverick/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
+++ b/ubuntu/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
diff --git a/ubuntu/maverick/applications/amarok/debian/patches/series b/ubuntu/_base/applications/amarok/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/amarok/debian/patches/series
+++ b/ubuntu/_base/applications/amarok/debian/patches/series
diff --git a/ubuntu/maverick/applications/amarok/debian/rules b/ubuntu/_base/applications/amarok/debian/rules
index b8d2b74d1..b8d2b74d1 100755
--- a/ubuntu/maverick/applications/amarok/debian/rules
+++ b/ubuntu/_base/applications/amarok/debian/rules
diff --git a/ubuntu/maverick/applications/amarok/debian/source/format b/ubuntu/_base/applications/amarok/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/amarok/debian/source/format
+++ b/ubuntu/_base/applications/amarok/debian/source/format
diff --git a/ubuntu/maverick/applications/amarok/debian/source/options b/ubuntu/_base/applications/amarok/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/amarok/debian/source/options
+++ b/ubuntu/_base/applications/amarok/debian/source/options
diff --git a/ubuntu/maverick/applications/amarok/debian/watch b/ubuntu/_base/applications/amarok/debian/watch
index b0a7420bb..b0a7420bb 100644
--- a/ubuntu/maverick/applications/amarok/debian/watch
+++ b/ubuntu/_base/applications/amarok/debian/watch
diff --git a/ubuntu/maverick/applications/basket/debian/basket-kontact-integration-trinity.install b/ubuntu/_base/applications/basket/debian/basket-kontact-integration-trinity.install
index 846f111d3..846f111d3 100644
--- a/ubuntu/maverick/applications/basket/debian/basket-kontact-integration-trinity.install
+++ b/ubuntu/_base/applications/basket/debian/basket-kontact-integration-trinity.install
diff --git a/ubuntu/maverick/applications/basket/debian/basket-trinity.install b/ubuntu/_base/applications/basket/debian/basket-trinity.install
index 127381a59..127381a59 100644
--- a/ubuntu/maverick/applications/basket/debian/basket-trinity.install
+++ b/ubuntu/_base/applications/basket/debian/basket-trinity.install
diff --git a/ubuntu/maverick/applications/basket/debian/basket.1 b/ubuntu/_base/applications/basket/debian/basket.1
index db272f06a..db272f06a 100644
--- a/ubuntu/maverick/applications/basket/debian/basket.1
+++ b/ubuntu/_base/applications/basket/debian/basket.1
diff --git a/ubuntu/maverick/applications/basket/debian/changelog b/ubuntu/_base/applications/basket/debian/changelog
index 10c6ce1f0..10c6ce1f0 100644
--- a/ubuntu/maverick/applications/basket/debian/changelog
+++ b/ubuntu/_base/applications/basket/debian/changelog
diff --git a/ubuntu/maverick/applications/basket/debian/compat b/ubuntu/_base/applications/basket/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/basket/debian/compat
+++ b/ubuntu/_base/applications/basket/debian/compat
diff --git a/ubuntu/maverick/applications/basket/debian/control b/ubuntu/_base/applications/basket/debian/control
index a0eac6fac..a0eac6fac 100644
--- a/ubuntu/maverick/applications/basket/debian/control
+++ b/ubuntu/_base/applications/basket/debian/control
diff --git a/ubuntu/maverick/applications/basket/debian/copyright b/ubuntu/_base/applications/basket/debian/copyright
index 32425ad0a..32425ad0a 100644
--- a/ubuntu/maverick/applications/basket/debian/copyright
+++ b/ubuntu/_base/applications/basket/debian/copyright
diff --git a/ubuntu/maverick/applications/basket/debian/dirs b/ubuntu/_base/applications/basket/debian/dirs
index f583045fe..f583045fe 100644
--- a/ubuntu/maverick/applications/basket/debian/dirs
+++ b/ubuntu/_base/applications/basket/debian/dirs
diff --git a/ubuntu/maverick/applications/basket/debian/docs b/ubuntu/_base/applications/basket/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/basket/debian/docs
+++ b/ubuntu/_base/applications/basket/debian/docs
diff --git a/ubuntu/maverick/applications/basket/debian/menu b/ubuntu/_base/applications/basket/debian/menu
index cca92cc0d..cca92cc0d 100644
--- a/ubuntu/maverick/applications/basket/debian/menu
+++ b/ubuntu/_base/applications/basket/debian/menu
diff --git a/ubuntu/maverick/applications/basket/debian/patches/series b/ubuntu/_base/applications/basket/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/basket/debian/patches/series
+++ b/ubuntu/_base/applications/basket/debian/patches/series
diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/_base/applications/basket/debian/rules
index 077485094..077485094 100755
--- a/ubuntu/maverick/applications/basket/debian/rules
+++ b/ubuntu/_base/applications/basket/debian/rules
diff --git a/ubuntu/maverick/applications/basket/debian/source/format b/ubuntu/_base/applications/basket/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/basket/debian/source/format
+++ b/ubuntu/_base/applications/basket/debian/source/format
diff --git a/ubuntu/maverick/applications/basket/debian/source/options b/ubuntu/_base/applications/basket/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/basket/debian/source/options
+++ b/ubuntu/_base/applications/basket/debian/source/options
diff --git a/ubuntu/maverick/applications/basket/debian/watch b/ubuntu/_base/applications/basket/debian/watch
index a620b0d5a..a620b0d5a 100644
--- a/ubuntu/maverick/applications/basket/debian/watch
+++ b/ubuntu/_base/applications/basket/debian/watch
diff --git a/ubuntu/maverick/applications/bibletime/debian/bibletime.xpm b/ubuntu/_base/applications/bibletime/debian/bibletime.xpm
index e782dea59..e782dea59 100644
--- a/ubuntu/maverick/applications/bibletime/debian/bibletime.xpm
+++ b/ubuntu/_base/applications/bibletime/debian/bibletime.xpm
diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/bibletime/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk b/ubuntu/_base/applications/bibletime/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/bibletime/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/versions.pl b/ubuntu/_base/applications/bibletime/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/bibletime/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/bibletime/debian/changelog b/ubuntu/_base/applications/bibletime/debian/changelog
index c31e55e82..c31e55e82 100644
--- a/ubuntu/maverick/applications/bibletime/debian/changelog
+++ b/ubuntu/_base/applications/bibletime/debian/changelog
diff --git a/ubuntu/maverick/applications/bibletime/debian/compat b/ubuntu/_base/applications/bibletime/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/bibletime/debian/compat
+++ b/ubuntu/_base/applications/bibletime/debian/compat
diff --git a/ubuntu/maverick/applications/bibletime/debian/control b/ubuntu/_base/applications/bibletime/debian/control
index f42d06bf4..f42d06bf4 100644
--- a/ubuntu/maverick/applications/bibletime/debian/control
+++ b/ubuntu/_base/applications/bibletime/debian/control
diff --git a/ubuntu/maverick/applications/bibletime/debian/copyright b/ubuntu/_base/applications/bibletime/debian/copyright
index c256c741a..c256c741a 100644
--- a/ubuntu/maverick/applications/bibletime/debian/copyright
+++ b/ubuntu/_base/applications/bibletime/debian/copyright
diff --git a/ubuntu/maverick/applications/bibletime/debian/de/bibletime.1 b/ubuntu/_base/applications/bibletime/debian/de/bibletime.1
index a7b223af3..a7b223af3 100644
--- a/ubuntu/maverick/applications/bibletime/debian/de/bibletime.1
+++ b/ubuntu/_base/applications/bibletime/debian/de/bibletime.1
diff --git a/ubuntu/maverick/applications/bibletime/debian/dirs b/ubuntu/_base/applications/bibletime/debian/dirs
index b870fa9c8..b870fa9c8 100644
--- a/ubuntu/maverick/applications/bibletime/debian/dirs
+++ b/ubuntu/_base/applications/bibletime/debian/dirs
diff --git a/ubuntu/maverick/applications/bibletime/debian/en/bibletime.1 b/ubuntu/_base/applications/bibletime/debian/en/bibletime.1
index 46332c7d9..46332c7d9 100644
--- a/ubuntu/maverick/applications/bibletime/debian/en/bibletime.1
+++ b/ubuntu/_base/applications/bibletime/debian/en/bibletime.1
diff --git a/ubuntu/maverick/applications/bibletime/debian/install b/ubuntu/_base/applications/bibletime/debian/install
index dc727ccec..dc727ccec 100644
--- a/ubuntu/maverick/applications/bibletime/debian/install
+++ b/ubuntu/_base/applications/bibletime/debian/install
diff --git a/ubuntu/maverick/applications/bibletime/debian/menu b/ubuntu/_base/applications/bibletime/debian/menu
index ad90450f6..ad90450f6 100644
--- a/ubuntu/maverick/applications/bibletime/debian/menu
+++ b/ubuntu/_base/applications/bibletime/debian/menu
diff --git a/ubuntu/maverick/applications/bibletime/debian/patches/series b/ubuntu/_base/applications/bibletime/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/bibletime/debian/patches/series
+++ b/ubuntu/_base/applications/bibletime/debian/patches/series
diff --git a/ubuntu/maverick/applications/bibletime/debian/rules b/ubuntu/_base/applications/bibletime/debian/rules
index eb2eab7e0..eb2eab7e0 100755
--- a/ubuntu/maverick/applications/bibletime/debian/rules
+++ b/ubuntu/_base/applications/bibletime/debian/rules
diff --git a/ubuntu/maverick/applications/bibletime/debian/source/format b/ubuntu/_base/applications/bibletime/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/bibletime/debian/source/format
+++ b/ubuntu/_base/applications/bibletime/debian/source/format
diff --git a/ubuntu/maverick/applications/bibletime/debian/source/options b/ubuntu/_base/applications/bibletime/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/bibletime/debian/source/options
+++ b/ubuntu/_base/applications/bibletime/debian/source/options
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/changelog b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/changelog
index d8a320aed..d8a320aed 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/changelog
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/changelog
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/compat b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/compat
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/compat
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/control
index 543b0f8d0..543b0f8d0 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/control
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/control
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/copyright b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/copyright
index 61d8f8195..61d8f8195 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/copyright
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/copyright
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/patches/series b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/patches/series
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/patches/series
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/rules
index e5c16cf8a..e5c16cf8a 100755
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/rules
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/rules
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/format b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/format
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/source/format
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/options b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/source/options
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/source/options
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/changelog b/ubuntu/_base/applications/desktop-effects-tde/debian/changelog
index 2b29f4bd9..2b29f4bd9 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/changelog
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/changelog
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/compat b/ubuntu/_base/applications/desktop-effects-tde/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/compat
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/compat
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/control b/ubuntu/_base/applications/desktop-effects-tde/debian/control
index 606b13ff9..606b13ff9 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/control
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/control
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/copyright b/ubuntu/_base/applications/desktop-effects-tde/debian/copyright
index b037bf1ac..b037bf1ac 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/copyright
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/copyright
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install b/ubuntu/_base/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
index 2b6b93781..2b6b93781 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules b/ubuntu/_base/applications/desktop-effects-tde/debian/rules
index 41ad63be2..41ad63be2 100755
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/rules
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/source/format b/ubuntu/_base/applications/desktop-effects-tde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/source/format
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/source/format
diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/source/options b/ubuntu/_base/applications/desktop-effects-tde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/desktop-effects-tde/debian/source/options
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/source/options
diff --git a/ubuntu/maverick/applications/digikam/debian/NEWS b/ubuntu/_base/applications/digikam/debian/NEWS
index a90a3b444..a90a3b444 100644
--- a/ubuntu/maverick/applications/digikam/debian/NEWS
+++ b/ubuntu/_base/applications/digikam/debian/NEWS
diff --git a/ubuntu/maverick/applications/digikam/debian/README.Debian b/ubuntu/_base/applications/digikam/debian/README.Debian
index 351a34b1f..351a34b1f 100644
--- a/ubuntu/maverick/applications/digikam/debian/README.Debian
+++ b/ubuntu/_base/applications/digikam/debian/README.Debian
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/digikam/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk b/ubuntu/_base/applications/digikam/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/digikam/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/versions.pl b/ubuntu/_base/applications/digikam/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/digikam/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/digikam/debian/changelog b/ubuntu/_base/applications/digikam/debian/changelog
index ea55ed699..ea55ed699 100644
--- a/ubuntu/maverick/applications/digikam/debian/changelog
+++ b/ubuntu/_base/applications/digikam/debian/changelog
diff --git a/ubuntu/maverick/applications/digikam/debian/clean b/ubuntu/_base/applications/digikam/debian/clean
index d0ada902a..d0ada902a 100644
--- a/ubuntu/maverick/applications/digikam/debian/clean
+++ b/ubuntu/_base/applications/digikam/debian/clean
diff --git a/ubuntu/maverick/applications/digikam/debian/compat b/ubuntu/_base/applications/digikam/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/digikam/debian/compat
+++ b/ubuntu/_base/applications/digikam/debian/compat
diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/_base/applications/digikam/debian/control
index 770fd9126..770fd9126 100644
--- a/ubuntu/maverick/applications/digikam/debian/control
+++ b/ubuntu/_base/applications/digikam/debian/control
diff --git a/ubuntu/maverick/applications/digikam/debian/copyright b/ubuntu/_base/applications/digikam/debian/copyright
index f46c77c80..f46c77c80 100644
--- a/ubuntu/maverick/applications/digikam/debian/copyright
+++ b/ubuntu/_base/applications/digikam/debian/copyright
diff --git a/ubuntu/maverick/applications/digikam/debian/digikam-trinity-doc.install b/ubuntu/_base/applications/digikam/debian/digikam-trinity-doc.install
index 31f007655..31f007655 100644
--- a/ubuntu/maverick/applications/digikam/debian/digikam-trinity-doc.install
+++ b/ubuntu/_base/applications/digikam/debian/digikam-trinity-doc.install
diff --git a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install b/ubuntu/_base/applications/digikam/debian/digikam-trinity.install
index 26e2288f9..26e2288f9 100644
--- a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install
+++ b/ubuntu/_base/applications/digikam/debian/digikam-trinity.install
diff --git a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.lintian-overrides b/ubuntu/_base/applications/digikam/debian/digikam-trinity.lintian-overrides
index 59b14fa47..59b14fa47 100644
--- a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/digikam/debian/digikam-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.manpages b/ubuntu/_base/applications/digikam/debian/digikam-trinity.manpages
index 4e21f2805..4e21f2805 100644
--- a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.manpages
+++ b/ubuntu/_base/applications/digikam/debian/digikam-trinity.manpages
diff --git a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu b/ubuntu/_base/applications/digikam/debian/digikam-trinity.menu
index ceb80fcee..ceb80fcee 100644
--- a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu
+++ b/ubuntu/_base/applications/digikam/debian/digikam-trinity.menu
diff --git a/ubuntu/maverick/applications/digikam/debian/digikam.manpage b/ubuntu/_base/applications/digikam/debian/digikam.manpage
index 539fd026a..539fd026a 100644
--- a/ubuntu/maverick/applications/digikam/debian/digikam.manpage
+++ b/ubuntu/_base/applications/digikam/debian/digikam.manpage
diff --git a/ubuntu/maverick/applications/digikam/debian/patches/series b/ubuntu/_base/applications/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/digikam/debian/patches/series
+++ b/ubuntu/_base/applications/digikam/debian/patches/series
diff --git a/ubuntu/maverick/applications/digikam/debian/rules b/ubuntu/_base/applications/digikam/debian/rules
index 10e1c6d22..10e1c6d22 100755
--- a/ubuntu/maverick/applications/digikam/debian/rules
+++ b/ubuntu/_base/applications/digikam/debian/rules
diff --git a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.install b/ubuntu/_base/applications/digikam/debian/showfoto-trinity.install
index 73ba9c643..73ba9c643 100644
--- a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.install
+++ b/ubuntu/_base/applications/digikam/debian/showfoto-trinity.install
diff --git a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.manpage b/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpage
index d8fce4f22..d8fce4f22 100644
--- a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.manpage
+++ b/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpage
diff --git a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.manpages b/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpages
index e146c959f..e146c959f 100644
--- a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.manpages
+++ b/ubuntu/_base/applications/digikam/debian/showfoto-trinity.manpages
diff --git a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu b/ubuntu/_base/applications/digikam/debian/showfoto-trinity.menu
index f7eea4b3b..f7eea4b3b 100644
--- a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu
+++ b/ubuntu/_base/applications/digikam/debian/showfoto-trinity.menu
diff --git a/ubuntu/maverick/applications/digikam/debian/source/format b/ubuntu/_base/applications/digikam/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/digikam/debian/source/format
+++ b/ubuntu/_base/applications/digikam/debian/source/format
diff --git a/ubuntu/maverick/applications/digikam/debian/source/options b/ubuntu/_base/applications/digikam/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/digikam/debian/source/options
+++ b/ubuntu/_base/applications/digikam/debian/source/options
diff --git a/ubuntu/maverick/applications/digikam/debian/watch b/ubuntu/_base/applications/digikam/debian/watch
index 16e6d05c4..16e6d05c4 100644
--- a/ubuntu/maverick/applications/digikam/debian/watch
+++ b/ubuntu/_base/applications/digikam/debian/watch
diff --git a/ubuntu/maverick/applications/digikam/debian/xpm.d/digikam-16.xpm b/ubuntu/_base/applications/digikam/debian/xpm.d/digikam-16.xpm
index 5820677d7..5820677d7 100644
--- a/ubuntu/maverick/applications/digikam/debian/xpm.d/digikam-16.xpm
+++ b/ubuntu/_base/applications/digikam/debian/xpm.d/digikam-16.xpm
diff --git a/ubuntu/maverick/applications/digikam/debian/xpm.d/digikam.xpm b/ubuntu/_base/applications/digikam/debian/xpm.d/digikam.xpm
index 88a2f7df2..88a2f7df2 100644
--- a/ubuntu/maverick/applications/digikam/debian/xpm.d/digikam.xpm
+++ b/ubuntu/_base/applications/digikam/debian/xpm.d/digikam.xpm
diff --git a/ubuntu/maverick/applications/digikam/debian/xpm.d/showfoto-16.xpm b/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm
index 7425c5ba7..7425c5ba7 100644
--- a/ubuntu/maverick/applications/digikam/debian/xpm.d/showfoto-16.xpm
+++ b/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm
diff --git a/ubuntu/maverick/applications/digikam/debian/xpm.d/showfoto.xpm b/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto.xpm
index ef7ea08fa..ef7ea08fa 100644
--- a/ubuntu/maverick/applications/digikam/debian/xpm.d/showfoto.xpm
+++ b/ubuntu/_base/applications/digikam/debian/xpm.d/showfoto.xpm
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/dolphin/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk b/ubuntu/_base/applications/dolphin/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/dolphin/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/versions.pl b/ubuntu/_base/applications/dolphin/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/dolphin/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/dolphin/debian/changelog b/ubuntu/_base/applications/dolphin/debian/changelog
index e66e5676b..e66e5676b 100644
--- a/ubuntu/maverick/applications/dolphin/debian/changelog
+++ b/ubuntu/_base/applications/dolphin/debian/changelog
diff --git a/ubuntu/maverick/applications/dolphin/debian/compat b/ubuntu/_base/applications/dolphin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/dolphin/debian/compat
+++ b/ubuntu/_base/applications/dolphin/debian/compat
diff --git a/ubuntu/maverick/applications/dolphin/debian/control b/ubuntu/_base/applications/dolphin/debian/control
index f8285a5b6..f8285a5b6 100644
--- a/ubuntu/maverick/applications/dolphin/debian/control
+++ b/ubuntu/_base/applications/dolphin/debian/control
diff --git a/ubuntu/maverick/applications/dolphin/debian/copyright b/ubuntu/_base/applications/dolphin/debian/copyright
index 970a6b5a2..970a6b5a2 100644
--- a/ubuntu/maverick/applications/dolphin/debian/copyright
+++ b/ubuntu/_base/applications/dolphin/debian/copyright
diff --git a/ubuntu/maverick/applications/dolphin/debian/patches/series b/ubuntu/_base/applications/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/dolphin/debian/patches/series
+++ b/ubuntu/_base/applications/dolphin/debian/patches/series
diff --git a/ubuntu/maverick/applications/dolphin/debian/rules b/ubuntu/_base/applications/dolphin/debian/rules
index c5872f434..c5872f434 100755
--- a/ubuntu/maverick/applications/dolphin/debian/rules
+++ b/ubuntu/_base/applications/dolphin/debian/rules
diff --git a/ubuntu/maverick/applications/dolphin/debian/source/format b/ubuntu/_base/applications/dolphin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/dolphin/debian/source/format
+++ b/ubuntu/_base/applications/dolphin/debian/source/format
diff --git a/ubuntu/maverick/applications/dolphin/debian/source/options b/ubuntu/_base/applications/dolphin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/dolphin/debian/source/options
+++ b/ubuntu/_base/applications/dolphin/debian/source/options
diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/filelight/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/filelight/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk b/ubuntu/_base/applications/filelight/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/filelight/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/versions.pl b/ubuntu/_base/applications/filelight/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/filelight/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/filelight/debian/changelog b/ubuntu/_base/applications/filelight/debian/changelog
index d59a45c8e..d59a45c8e 100644
--- a/ubuntu/maverick/applications/filelight/debian/changelog
+++ b/ubuntu/_base/applications/filelight/debian/changelog
diff --git a/ubuntu/maverick/applications/filelight/debian/compat b/ubuntu/_base/applications/filelight/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/filelight/debian/compat
+++ b/ubuntu/_base/applications/filelight/debian/compat
diff --git a/ubuntu/maverick/applications/filelight/debian/control b/ubuntu/_base/applications/filelight/debian/control
index b90fda11c..b90fda11c 100644
--- a/ubuntu/maverick/applications/filelight/debian/control
+++ b/ubuntu/_base/applications/filelight/debian/control
diff --git a/ubuntu/maverick/applications/filelight/debian/copyright b/ubuntu/_base/applications/filelight/debian/copyright
index c02dc5949..c02dc5949 100644
--- a/ubuntu/maverick/applications/filelight/debian/copyright
+++ b/ubuntu/_base/applications/filelight/debian/copyright
diff --git a/ubuntu/maverick/applications/filelight/debian/filelight.1 b/ubuntu/_base/applications/filelight/debian/filelight.1
index ce932984b..ce932984b 100644
--- a/ubuntu/maverick/applications/filelight/debian/filelight.1
+++ b/ubuntu/_base/applications/filelight/debian/filelight.1
diff --git a/ubuntu/maverick/applications/filelight/debian/menu b/ubuntu/_base/applications/filelight/debian/menu
index 943809a61..943809a61 100644
--- a/ubuntu/maverick/applications/filelight/debian/menu
+++ b/ubuntu/_base/applications/filelight/debian/menu
diff --git a/ubuntu/maverick/applications/filelight/debian/patches/series b/ubuntu/_base/applications/filelight/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/filelight/debian/patches/series
+++ b/ubuntu/_base/applications/filelight/debian/patches/series
diff --git a/ubuntu/maverick/applications/filelight/debian/rules b/ubuntu/_base/applications/filelight/debian/rules
index f296f481e..f296f481e 100755
--- a/ubuntu/maverick/applications/filelight/debian/rules
+++ b/ubuntu/_base/applications/filelight/debian/rules
diff --git a/ubuntu/maverick/applications/filelight/debian/source/format b/ubuntu/_base/applications/filelight/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/filelight/debian/source/format
+++ b/ubuntu/_base/applications/filelight/debian/source/format
diff --git a/ubuntu/maverick/applications/filelight/debian/source/options b/ubuntu/_base/applications/filelight/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/filelight/debian/source/options
+++ b/ubuntu/_base/applications/filelight/debian/source/options
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/changelog b/ubuntu/_base/applications/fusion-icon/debian/changelog
index 87f2b117a..87f2b117a 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/changelog
+++ b/ubuntu/_base/applications/fusion-icon/debian/changelog
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/compat b/ubuntu/_base/applications/fusion-icon/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/compat
+++ b/ubuntu/_base/applications/fusion-icon/debian/compat
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/control b/ubuntu/_base/applications/fusion-icon/debian/control
index 580c7c95d..580c7c95d 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/control
+++ b/ubuntu/_base/applications/fusion-icon/debian/control
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/copyright b/ubuntu/_base/applications/fusion-icon/debian/copyright
index ae1ce34fa..ae1ce34fa 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/copyright
+++ b/ubuntu/_base/applications/fusion-icon/debian/copyright
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/fusion-icon.1 b/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.1
index 1b15860e1..1b15860e1 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/fusion-icon.1
+++ b/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.1
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/fusion-icon.xpm b/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.xpm
index fe0843739..fe0843739 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/fusion-icon.xpm
+++ b/ubuntu/_base/applications/fusion-icon/debian/fusion-icon.xpm
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/install b/ubuntu/_base/applications/fusion-icon/debian/install
index 7d4e26567..7d4e26567 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/install
+++ b/ubuntu/_base/applications/fusion-icon/debian/install
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/links b/ubuntu/_base/applications/fusion-icon/debian/links
index 51627e83a..51627e83a 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/links
+++ b/ubuntu/_base/applications/fusion-icon/debian/links
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/manpages b/ubuntu/_base/applications/fusion-icon/debian/manpages
index 3ba122a39..3ba122a39 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/manpages
+++ b/ubuntu/_base/applications/fusion-icon/debian/manpages
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/menu b/ubuntu/_base/applications/fusion-icon/debian/menu
index e85a21dbf..e85a21dbf 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/menu
+++ b/ubuntu/_base/applications/fusion-icon/debian/menu
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/patches/series b/ubuntu/_base/applications/fusion-icon/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/patches/series
+++ b/ubuntu/_base/applications/fusion-icon/debian/patches/series
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/pycompat b/ubuntu/_base/applications/fusion-icon/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/pycompat
+++ b/ubuntu/_base/applications/fusion-icon/debian/pycompat
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/python-distutils-custom.mk b/ubuntu/_base/applications/fusion-icon/debian/python-distutils-custom.mk
index fbc70a624..fbc70a624 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/python-distutils-custom.mk
+++ b/ubuntu/_base/applications/fusion-icon/debian/python-distutils-custom.mk
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/_base/applications/fusion-icon/debian/rules
index f1b2fcb21..f1b2fcb21 100755
--- a/ubuntu/maverick/applications/fusion-icon/debian/rules
+++ b/ubuntu/_base/applications/fusion-icon/debian/rules
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/source/format b/ubuntu/_base/applications/fusion-icon/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/source/format
+++ b/ubuntu/_base/applications/fusion-icon/debian/source/format
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/source/options b/ubuntu/_base/applications/fusion-icon/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/source/options
+++ b/ubuntu/_base/applications/fusion-icon/debian/source/options
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
index 6bc424f8e..6bc424f8e 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
index e25e89fd4..e25e89fd4 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-qt-kde.mk
index 65f5f6f95..65f5f6f95 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/versions.pl b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/changelog b/ubuntu/_base/applications/gtk-qt-engine/debian/changelog
index 5f3195390..5f3195390 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/changelog
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/changelog
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/compat b/ubuntu/_base/applications/gtk-qt-engine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/compat
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/compat
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/control b/ubuntu/_base/applications/gtk-qt-engine/debian/control
index f7328b96c..f7328b96c 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/control
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/control
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/copyright b/ubuntu/_base/applications/gtk-qt-engine/debian/copyright
index aa4e449ee..aa4e449ee 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/copyright
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/copyright
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
index 5502ed8f4..5502ed8f4 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install b/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
index 73ebaf828..73ebaf828 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
index b477f5ce2..b477f5ce2 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series b/ubuntu/_base/applications/gtk-qt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/patches/series
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/patches/series
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/gtk-qt-engine/debian/rules
index 0aa6ab9a6..0aa6ab9a6 100755
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/rules
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/source/format b/ubuntu/_base/applications/gtk-qt-engine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/source/format
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/source/format
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/source/options b/ubuntu/_base/applications/gtk-qt-engine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/source/options
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/source/options
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/changelog b/ubuntu/_base/applications/gtk3-tqt-engine/debian/changelog
index c9799f7f2..c9799f7f2 100644
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/changelog
+++ b/ubuntu/_base/applications/gtk3-tqt-engine/debian/changelog
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/compat b/ubuntu/_base/applications/gtk3-tqt-engine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/compat
+++ b/ubuntu/_base/applications/gtk3-tqt-engine/debian/compat
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/control b/ubuntu/_base/applications/gtk3-tqt-engine/debian/control
index a0abc773d..a0abc773d 100644
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/control
+++ b/ubuntu/_base/applications/gtk3-tqt-engine/debian/control
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/copyright b/ubuntu/_base/applications/gtk3-tqt-engine/debian/copyright
index 540709e87..540709e87 100644
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/copyright
+++ b/ubuntu/_base/applications/gtk3-tqt-engine/debian/copyright
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/patches/series b/ubuntu/_base/applications/gtk3-tqt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/patches/series
+++ b/ubuntu/_base/applications/gtk3-tqt-engine/debian/patches/series
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/rules b/ubuntu/_base/applications/gtk3-tqt-engine/debian/rules
index 272168641..272168641 100755
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/rules
+++ b/ubuntu/_base/applications/gtk3-tqt-engine/debian/rules
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/source/format b/ubuntu/_base/applications/gtk3-tqt-engine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/source/format
+++ b/ubuntu/_base/applications/gtk3-tqt-engine/debian/source/format
diff --git a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/source/options b/ubuntu/_base/applications/gtk3-tqt-engine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/gtk3-tqt-engine/debian/source/options
+++ b/ubuntu/_base/applications/gtk3-tqt-engine/debian/source/options
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/kde.mk b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/versions.pl b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/changelog b/ubuntu/_base/applications/gwenview-i18n/debian/changelog
index 035a06d71..035a06d71 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/changelog
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/changelog
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/compat b/ubuntu/_base/applications/gwenview-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/compat
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/compat
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/control b/ubuntu/_base/applications/gwenview-i18n/debian/control
index 9510f2c61..9510f2c61 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/control
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/control
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/copyright b/ubuntu/_base/applications/gwenview-i18n/debian/copyright
index b0709da94..b0709da94 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/copyright
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/copyright
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/patches/series b/ubuntu/_base/applications/gwenview-i18n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/patches/series
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/patches/series
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/rules b/ubuntu/_base/applications/gwenview-i18n/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/rules
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/rules
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/source/format b/ubuntu/_base/applications/gwenview-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/source/format
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/source/format
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/source/options b/ubuntu/_base/applications/gwenview-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/source/options
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/source/options
diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/gwenview/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk b/ubuntu/_base/applications/gwenview/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/gwenview/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/versions.pl b/ubuntu/_base/applications/gwenview/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/gwenview/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/gwenview/debian/changelog b/ubuntu/_base/applications/gwenview/debian/changelog
index 8b14ebe9b..8b14ebe9b 100644
--- a/ubuntu/maverick/applications/gwenview/debian/changelog
+++ b/ubuntu/_base/applications/gwenview/debian/changelog
diff --git a/ubuntu/maverick/applications/gwenview/debian/compat b/ubuntu/_base/applications/gwenview/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/gwenview/debian/compat
+++ b/ubuntu/_base/applications/gwenview/debian/compat
diff --git a/ubuntu/maverick/applications/gwenview/debian/control b/ubuntu/_base/applications/gwenview/debian/control
index dc6a9f194..dc6a9f194 100644
--- a/ubuntu/maverick/applications/gwenview/debian/control
+++ b/ubuntu/_base/applications/gwenview/debian/control
diff --git a/ubuntu/maverick/applications/gwenview/debian/copyright b/ubuntu/_base/applications/gwenview/debian/copyright
index d87dc89ff..d87dc89ff 100644
--- a/ubuntu/maverick/applications/gwenview/debian/copyright
+++ b/ubuntu/_base/applications/gwenview/debian/copyright
diff --git a/ubuntu/maverick/applications/gwenview/debian/gwenview-trinity.doc-base b/ubuntu/_base/applications/gwenview/debian/gwenview-trinity.doc-base
index 931c8d219..931c8d219 100644
--- a/ubuntu/maverick/applications/gwenview/debian/gwenview-trinity.doc-base
+++ b/ubuntu/_base/applications/gwenview/debian/gwenview-trinity.doc-base
diff --git a/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian b/ubuntu/_base/applications/gwenview/debian/gwenview.lintian
index 0e247a6ab..0e247a6ab 100644
--- a/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
+++ b/ubuntu/_base/applications/gwenview/debian/gwenview.lintian
diff --git a/ubuntu/maverick/applications/gwenview/debian/gwenview.xpm b/ubuntu/_base/applications/gwenview/debian/gwenview.xpm
index 076efa834..076efa834 100644
--- a/ubuntu/maverick/applications/gwenview/debian/gwenview.xpm
+++ b/ubuntu/_base/applications/gwenview/debian/gwenview.xpm
diff --git a/ubuntu/maverick/applications/gwenview/debian/menu b/ubuntu/_base/applications/gwenview/debian/menu
index d357e08e1..d357e08e1 100644
--- a/ubuntu/maverick/applications/gwenview/debian/menu
+++ b/ubuntu/_base/applications/gwenview/debian/menu
diff --git a/ubuntu/maverick/applications/gwenview/debian/patches/series b/ubuntu/_base/applications/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/gwenview/debian/patches/series
+++ b/ubuntu/_base/applications/gwenview/debian/patches/series
diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/_base/applications/gwenview/debian/rules
index da7ae8495..da7ae8495 100755
--- a/ubuntu/maverick/applications/gwenview/debian/rules
+++ b/ubuntu/_base/applications/gwenview/debian/rules
diff --git a/ubuntu/maverick/applications/gwenview/debian/source/format b/ubuntu/_base/applications/gwenview/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/gwenview/debian/source/format
+++ b/ubuntu/_base/applications/gwenview/debian/source/format
diff --git a/ubuntu/maverick/applications/gwenview/debian/source/options b/ubuntu/_base/applications/gwenview/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/gwenview/debian/source/options
+++ b/ubuntu/_base/applications/gwenview/debian/source/options
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/changelog b/ubuntu/_base/applications/k3b-i18n/debian/changelog
index 3d2a61f28..3d2a61f28 100644
--- a/ubuntu/maverick/applications/k3b-i18n/debian/changelog
+++ b/ubuntu/_base/applications/k3b-i18n/debian/changelog
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/compat b/ubuntu/_base/applications/k3b-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/k3b-i18n/debian/compat
+++ b/ubuntu/_base/applications/k3b-i18n/debian/compat
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/control b/ubuntu/_base/applications/k3b-i18n/debian/control
index e60594bc2..e60594bc2 100644
--- a/ubuntu/maverick/applications/k3b-i18n/debian/control
+++ b/ubuntu/_base/applications/k3b-i18n/debian/control
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/copyright b/ubuntu/_base/applications/k3b-i18n/debian/copyright
index c4a57636b..c4a57636b 100644
--- a/ubuntu/maverick/applications/k3b-i18n/debian/copyright
+++ b/ubuntu/_base/applications/k3b-i18n/debian/copyright
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/rules b/ubuntu/_base/applications/k3b-i18n/debian/rules
index b39ae7f08..b39ae7f08 100755
--- a/ubuntu/maverick/applications/k3b-i18n/debian/rules
+++ b/ubuntu/_base/applications/k3b-i18n/debian/rules
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/source/format b/ubuntu/_base/applications/k3b-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/k3b-i18n/debian/source/format
+++ b/ubuntu/_base/applications/k3b-i18n/debian/source/format
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/source/options b/ubuntu/_base/applications/k3b-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/k3b-i18n/debian/source/options
+++ b/ubuntu/_base/applications/k3b-i18n/debian/source/options
diff --git a/ubuntu/maverick/applications/k3b-i18n/debian/watch b/ubuntu/_base/applications/k3b-i18n/debian/watch
index cdaaf355a..cdaaf355a 100644
--- a/ubuntu/maverick/applications/k3b-i18n/debian/watch
+++ b/ubuntu/_base/applications/k3b-i18n/debian/watch
diff --git a/ubuntu/maverick/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 7b99dabec..7b99dabec 100644
--- a/ubuntu/maverick/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/applications/k3b/debian/README.Debian b/ubuntu/_base/applications/k3b/debian/README.Debian
index f87a80e77..f87a80e77 100644
--- a/ubuntu/maverick/applications/k3b/debian/README.Debian
+++ b/ubuntu/_base/applications/k3b/debian/README.Debian
diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/k3b/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/k3b/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk b/ubuntu/_base/applications/k3b/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/k3b/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/versions.pl b/ubuntu/_base/applications/k3b/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/k3b/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/k3b/debian/changelog b/ubuntu/_base/applications/k3b/debian/changelog
index 9a28f0473..9a28f0473 100644
--- a/ubuntu/maverick/applications/k3b/debian/changelog
+++ b/ubuntu/_base/applications/k3b/debian/changelog
diff --git a/ubuntu/maverick/applications/k3b/debian/compat b/ubuntu/_base/applications/k3b/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/k3b/debian/compat
+++ b/ubuntu/_base/applications/k3b/debian/compat
diff --git a/ubuntu/maverick/applications/k3b/debian/control b/ubuntu/_base/applications/k3b/debian/control
index e53fae87a..e53fae87a 100644
--- a/ubuntu/maverick/applications/k3b/debian/control
+++ b/ubuntu/_base/applications/k3b/debian/control
diff --git a/ubuntu/maverick/applications/k3b/debian/copyright b/ubuntu/_base/applications/k3b/debian/copyright
index b5022ab93..b5022ab93 100644
--- a/ubuntu/maverick/applications/k3b/debian/copyright
+++ b/ubuntu/_base/applications/k3b/debian/copyright
diff --git a/ubuntu/maverick/applications/k3b/debian/docs b/ubuntu/_base/applications/k3b/debian/docs
index 623fe2da9..623fe2da9 100644
--- a/ubuntu/maverick/applications/k3b/debian/docs
+++ b/ubuntu/_base/applications/k3b/debian/docs
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-data-trinity.install b/ubuntu/_base/applications/k3b/debian/k3b-data-trinity.install
index af584fe32..af584fe32 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-data-trinity.install
+++ b/ubuntu/_base/applications/k3b/debian/k3b-data-trinity.install
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-data.files b/ubuntu/_base/applications/k3b/debian/k3b-data.files
index 3b3a0add7..3b3a0add7 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-data.files
+++ b/ubuntu/_base/applications/k3b/debian/k3b-data.files
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-data.install b/ubuntu/_base/applications/k3b/debian/k3b-data.install
index b7175c514..b7175c514 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-data.install
+++ b/ubuntu/_base/applications/k3b/debian/k3b-data.install
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-rip-audiocd.desktop b/ubuntu/_base/applications/k3b/debian/k3b-rip-audiocd.desktop
index 811d936a8..811d936a8 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-rip-audiocd.desktop
+++ b/ubuntu/_base/applications/k3b/debian/k3b-rip-audiocd.desktop
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-rip-videodvd.desktop b/ubuntu/_base/applications/k3b/debian/k3b-rip-videodvd.desktop
index 2f20cf920..2f20cf920 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-rip-videodvd.desktop
+++ b/ubuntu/_base/applications/k3b/debian/k3b-rip-videodvd.desktop
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.1 b/ubuntu/_base/applications/k3b/debian/k3b-trinity.1
index 08ca27b5f..08ca27b5f 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.1
+++ b/ubuntu/_base/applications/k3b/debian/k3b-trinity.1
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install b/ubuntu/_base/applications/k3b/debian/k3b-trinity.install
index a72c0b374..a72c0b374 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.install
+++ b/ubuntu/_base/applications/k3b/debian/k3b-trinity.install
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.manpages b/ubuntu/_base/applications/k3b/debian/k3b-trinity.manpages
index 328f16efe..328f16efe 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.manpages
+++ b/ubuntu/_base/applications/k3b/debian/k3b-trinity.manpages
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu b/ubuntu/_base/applications/k3b/debian/k3b-trinity.menu
index e3ec0ef1f..e3ec0ef1f 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu
+++ b/ubuntu/_base/applications/k3b/debian/k3b-trinity.menu
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.postinst b/ubuntu/_base/applications/k3b/debian/k3b-trinity.postinst
index 3807d55e6..3807d55e6 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.postinst
+++ b/ubuntu/_base/applications/k3b/debian/k3b-trinity.postinst
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-write-bin-image.desktop b/ubuntu/_base/applications/k3b/debian/k3b-write-bin-image.desktop
index f1223957d..f1223957d 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-write-bin-image.desktop
+++ b/ubuntu/_base/applications/k3b/debian/k3b-write-bin-image.desktop
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-write-iso-image.desktop b/ubuntu/_base/applications/k3b/debian/k3b-write-iso-image.desktop
index bc8b04a50..bc8b04a50 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-write-iso-image.desktop
+++ b/ubuntu/_base/applications/k3b/debian/k3b-write-iso-image.desktop
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b.files b/ubuntu/_base/applications/k3b/debian/k3b.files
index d6388a5b6..d6388a5b6 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b.files
+++ b/ubuntu/_base/applications/k3b/debian/k3b.files
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b.install b/ubuntu/_base/applications/k3b/debian/k3b.install
index 134bb0bf2..134bb0bf2 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b.install
+++ b/ubuntu/_base/applications/k3b/debian/k3b.install
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b.manpages b/ubuntu/_base/applications/k3b/debian/k3b.manpages
index 60dde70bc..60dde70bc 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b.manpages
+++ b/ubuntu/_base/applications/k3b/debian/k3b.manpages
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b.menu b/ubuntu/_base/applications/k3b/debian/k3b.menu
index e3ec0ef1f..e3ec0ef1f 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b.menu
+++ b/ubuntu/_base/applications/k3b/debian/k3b.menu
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b.postinst b/ubuntu/_base/applications/k3b/debian/k3b.postinst
index 3807d55e6..3807d55e6 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b.postinst
+++ b/ubuntu/_base/applications/k3b/debian/k3b.postinst
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b.xpm b/ubuntu/_base/applications/k3b/debian/k3b.xpm
index a7748bac4..a7748bac4 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b.xpm
+++ b/ubuntu/_base/applications/k3b/debian/k3b.xpm
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b-dev.files b/ubuntu/_base/applications/k3b/debian/libk3b-dev.files
index d45003d06..d45003d06 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b-dev.files
+++ b/ubuntu/_base/applications/k3b/debian/libk3b-dev.files
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b-dev.install b/ubuntu/_base/applications/k3b/debian/libk3b-dev.install
index 6257a06d1..6257a06d1 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b-dev.install
+++ b/ubuntu/_base/applications/k3b/debian/libk3b-dev.install
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b-trinity-dev.install b/ubuntu/_base/applications/k3b/debian/libk3b-trinity-dev.install
index 575f91fdb..575f91fdb 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b-trinity-dev.install
+++ b/ubuntu/_base/applications/k3b/debian/libk3b-trinity-dev.install
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3-extracodecs-trinity.install b/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install
index d806398ef..d806398ef 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3-extracodecs-trinity.install
+++ b/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3-extracodecs.install b/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs.install
index 0e57a97dc..0e57a97dc 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3-extracodecs.install
+++ b/ubuntu/_base/applications/k3b/debian/libk3b3-extracodecs.install
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install b/ubuntu/_base/applications/k3b/debian/libk3b3-trinity.install
index 9918b6192..9918b6192 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3-trinity.install
+++ b/ubuntu/_base/applications/k3b/debian/libk3b3-trinity.install
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3.files b/ubuntu/_base/applications/k3b/debian/libk3b3.files
index d77e53e7c..d77e53e7c 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3.files
+++ b/ubuntu/_base/applications/k3b/debian/libk3b3.files
diff --git a/ubuntu/maverick/applications/k3b/debian/libk3b3.install b/ubuntu/_base/applications/k3b/debian/libk3b3.install
index 69b7f7909..69b7f7909 100644
--- a/ubuntu/maverick/applications/k3b/debian/libk3b3.install
+++ b/ubuntu/_base/applications/k3b/debian/libk3b3.install
diff --git a/ubuntu/maverick/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/ubuntu/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
index dc44bfdb8..dc44bfdb8 100644
--- a/ubuntu/maverick/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
+++ b/ubuntu/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
diff --git a/ubuntu/maverick/applications/k3b/debian/patches/series b/ubuntu/_base/applications/k3b/debian/patches/series
index bff63cb8c..bff63cb8c 100644
--- a/ubuntu/maverick/applications/k3b/debian/patches/series
+++ b/ubuntu/_base/applications/k3b/debian/patches/series
diff --git a/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/_base/applications/k3b/debian/rules
index bcd6107c9..bcd6107c9 100755
--- a/ubuntu/maverick/applications/k3b/debian/rules
+++ b/ubuntu/_base/applications/k3b/debian/rules
diff --git a/ubuntu/maverick/applications/k3b/debian/source/format b/ubuntu/_base/applications/k3b/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/k3b/debian/source/format
+++ b/ubuntu/_base/applications/k3b/debian/source/format
diff --git a/ubuntu/maverick/applications/k3b/debian/source/options b/ubuntu/_base/applications/k3b/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/k3b/debian/source/options
+++ b/ubuntu/_base/applications/k3b/debian/source/options
diff --git a/ubuntu/maverick/applications/k3b/debian/watch b/ubuntu/_base/applications/k3b/debian/watch
index 7e3c554ae..7e3c554ae 100644
--- a/ubuntu/maverick/applications/k3b/debian/watch
+++ b/ubuntu/_base/applications/k3b/debian/watch
diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/k9copy/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk b/ubuntu/_base/applications/k9copy/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/k9copy/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/versions.pl b/ubuntu/_base/applications/k9copy/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/k9copy/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/k9copy/debian/changelog b/ubuntu/_base/applications/k9copy/debian/changelog
index 5220703ba..5220703ba 100644
--- a/ubuntu/maverick/applications/k9copy/debian/changelog
+++ b/ubuntu/_base/applications/k9copy/debian/changelog
diff --git a/ubuntu/maverick/applications/k9copy/debian/compat b/ubuntu/_base/applications/k9copy/debian/compat
index 4d446d8de..4d446d8de 100644
--- a/ubuntu/maverick/applications/k9copy/debian/compat
+++ b/ubuntu/_base/applications/k9copy/debian/compat
diff --git a/ubuntu/maverick/applications/k9copy/debian/control b/ubuntu/_base/applications/k9copy/debian/control
index ef4024e07..ef4024e07 100644
--- a/ubuntu/maverick/applications/k9copy/debian/control
+++ b/ubuntu/_base/applications/k9copy/debian/control
diff --git a/ubuntu/maverick/applications/k9copy/debian/copyright b/ubuntu/_base/applications/k9copy/debian/copyright
index c08901dd0..c08901dd0 100644
--- a/ubuntu/maverick/applications/k9copy/debian/copyright
+++ b/ubuntu/_base/applications/k9copy/debian/copyright
diff --git a/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook b/ubuntu/_base/applications/k9copy/debian/k9copy.1.docbook
index 96001a6ad..96001a6ad 100644
--- a/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook
+++ b/ubuntu/_base/applications/k9copy/debian/k9copy.1.docbook
diff --git a/ubuntu/maverick/applications/k9copy/debian/patches/series b/ubuntu/_base/applications/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/k9copy/debian/patches/series
+++ b/ubuntu/_base/applications/k9copy/debian/patches/series
diff --git a/ubuntu/maverick/applications/k9copy/debian/rules b/ubuntu/_base/applications/k9copy/debian/rules
index 1552cad7a..1552cad7a 100755
--- a/ubuntu/maverick/applications/k9copy/debian/rules
+++ b/ubuntu/_base/applications/k9copy/debian/rules
diff --git a/ubuntu/maverick/applications/k9copy/debian/source/format b/ubuntu/_base/applications/k9copy/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/k9copy/debian/source/format
+++ b/ubuntu/_base/applications/k9copy/debian/source/format
diff --git a/ubuntu/maverick/applications/k9copy/debian/source/options b/ubuntu/_base/applications/k9copy/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/k9copy/debian/source/options
+++ b/ubuntu/_base/applications/k9copy/debian/source/options
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/changelog b/ubuntu/_base/applications/kaffeine-mozilla/debian/changelog
index 7e3c2a0fd..7e3c2a0fd 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/changelog
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/changelog
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/compat b/ubuntu/_base/applications/kaffeine-mozilla/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/compat
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/compat
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/control b/ubuntu/_base/applications/kaffeine-mozilla/debian/control
index 9a029c19a..9a029c19a 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/control
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/control
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/copyright b/ubuntu/_base/applications/kaffeine-mozilla/debian/copyright
index d7092f934..d7092f934 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/copyright
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/copyright
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/docs b/ubuntu/_base/applications/kaffeine-mozilla/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/docs
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/docs
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install b/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
index 30f14a91f..30f14a91f 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links b/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
index 372fe38d5..372fe38d5 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules b/ubuntu/_base/applications/kaffeine-mozilla/debian/rules
index 228818f36..228818f36 100755
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/rules
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/format b/ubuntu/_base/applications/kaffeine-mozilla/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/format
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/source/format
diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/options b/ubuntu/_base/applications/kaffeine-mozilla/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/source/options
+++ b/ubuntu/_base/applications/kaffeine-mozilla/debian/source/options
diff --git a/ubuntu/maverick/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 1d06672c7..1d06672c7 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/applications/kaffeine/debian/README.Debian b/ubuntu/_base/applications/kaffeine/debian/README.Debian
index 74cac614e..74cac614e 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/README.Debian
+++ b/ubuntu/_base/applications/kaffeine/debian/README.Debian
diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/_base/applications/kaffeine/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kaffeine/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/versions.pl b/ubuntu/_base/applications/kaffeine/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kaffeine/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kaffeine/debian/changelog b/ubuntu/_base/applications/kaffeine/debian/changelog
index ffbd93281..ffbd93281 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/changelog
+++ b/ubuntu/_base/applications/kaffeine/debian/changelog
diff --git a/ubuntu/maverick/applications/kaffeine/debian/compat b/ubuntu/_base/applications/kaffeine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/compat
+++ b/ubuntu/_base/applications/kaffeine/debian/compat
diff --git a/ubuntu/maverick/applications/kaffeine/debian/control b/ubuntu/_base/applications/kaffeine/debian/control
index 32d29337b..32d29337b 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/control
+++ b/ubuntu/_base/applications/kaffeine/debian/control
diff --git a/ubuntu/maverick/applications/kaffeine/debian/copyright b/ubuntu/_base/applications/kaffeine/debian/copyright
index e1f37677a..e1f37677a 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/copyright
+++ b/ubuntu/_base/applications/kaffeine/debian/copyright
diff --git a/ubuntu/maverick/applications/kaffeine/debian/docs b/ubuntu/_base/applications/kaffeine/debian/docs
index 194085499..194085499 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/docs
+++ b/ubuntu/_base/applications/kaffeine/debian/docs
diff --git a/ubuntu/maverick/applications/kaffeine/debian/install-codecs b/ubuntu/_base/applications/kaffeine/debian/install-codecs
index 720dfcd4c..720dfcd4c 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/install-codecs
+++ b/ubuntu/_base/applications/kaffeine/debian/install-codecs
diff --git a/ubuntu/maverick/applications/kaffeine/debian/install-css.sh b/ubuntu/_base/applications/kaffeine/debian/install-css.sh
index f374562ff..f374562ff 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/install-css.sh
+++ b/ubuntu/_base/applications/kaffeine/debian/install-css.sh
diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
index cddfdc50f..cddfdc50f 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-iso.desktop b/ubuntu/_base/applications/kaffeine/debian/kaffeine-iso.desktop
index 63cf8f167..63cf8f167 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-iso.desktop
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine-iso.desktop
diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install b/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install
index 4777ef63c..4777ef63c 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.install
diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides b/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
index 2e7541445..2e7541445 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine.1 b/ubuntu/_base/applications/kaffeine/debian/kaffeine.1
index 0d66e29a8..0d66e29a8 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine.1
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine.1
diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine.xpm b/ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm
index 255d651d9..255d651d9 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine.xpm
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine.xpm
diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine_codecinstall.desktop b/ubuntu/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop
index 7f22f6b07..7f22f6b07 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine_codecinstall.desktop
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop
diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop b/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
index 7192a4f53..7192a4f53 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop b/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
index b32fcac45..b32fcac45 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
+++ b/ubuntu/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
diff --git a/ubuntu/maverick/applications/kaffeine/debian/menu b/ubuntu/_base/applications/kaffeine/debian/menu
index 2a2ed2f01..2a2ed2f01 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/menu
+++ b/ubuntu/_base/applications/kaffeine/debian/menu
diff --git a/ubuntu/maverick/applications/kaffeine/debian/patches/series b/ubuntu/_base/applications/kaffeine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/patches/series
+++ b/ubuntu/_base/applications/kaffeine/debian/patches/series
diff --git a/ubuntu/maverick/applications/kaffeine/debian/rules b/ubuntu/_base/applications/kaffeine/debian/rules
index 01ea04305..01ea04305 100755
--- a/ubuntu/maverick/applications/kaffeine/debian/rules
+++ b/ubuntu/_base/applications/kaffeine/debian/rules
diff --git a/ubuntu/maverick/applications/kaffeine/debian/source/format b/ubuntu/_base/applications/kaffeine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/source/format
+++ b/ubuntu/_base/applications/kaffeine/debian/source/format
diff --git a/ubuntu/maverick/applications/kaffeine/debian/source/options b/ubuntu/_base/applications/kaffeine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/source/options
+++ b/ubuntu/_base/applications/kaffeine/debian/source/options
diff --git a/ubuntu/maverick/applications/kaffeine/debian/watch b/ubuntu/_base/applications/kaffeine/debian/watch
index 3f054ccd4..3f054ccd4 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/watch
+++ b/ubuntu/_base/applications/kaffeine/debian/watch
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk b/ubuntu/_base/applications/kasablanca/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kasablanca/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/versions.pl b/ubuntu/_base/applications/kasablanca/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kasablanca/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kasablanca/debian/changelog b/ubuntu/_base/applications/kasablanca/debian/changelog
index 22010973d..22010973d 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/changelog
+++ b/ubuntu/_base/applications/kasablanca/debian/changelog
diff --git a/ubuntu/maverick/applications/kasablanca/debian/compat b/ubuntu/_base/applications/kasablanca/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/compat
+++ b/ubuntu/_base/applications/kasablanca/debian/compat
diff --git a/ubuntu/maverick/applications/kasablanca/debian/control b/ubuntu/_base/applications/kasablanca/debian/control
index 2ae39fb54..2ae39fb54 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/control
+++ b/ubuntu/_base/applications/kasablanca/debian/control
diff --git a/ubuntu/maverick/applications/kasablanca/debian/copyright b/ubuntu/_base/applications/kasablanca/debian/copyright
index 1424088cd..1424088cd 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/copyright
+++ b/ubuntu/_base/applications/kasablanca/debian/copyright
diff --git a/ubuntu/maverick/applications/kasablanca/debian/docs b/ubuntu/_base/applications/kasablanca/debian/docs
index 1333ed77b..1333ed77b 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/docs
+++ b/ubuntu/_base/applications/kasablanca/debian/docs
diff --git a/ubuntu/maverick/applications/kasablanca/debian/kasablanca.xml b/ubuntu/_base/applications/kasablanca/debian/kasablanca.xml
index 5f142fd2b..5f142fd2b 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/kasablanca.xml
+++ b/ubuntu/_base/applications/kasablanca/debian/kasablanca.xml
diff --git a/ubuntu/maverick/applications/kasablanca/debian/manpages b/ubuntu/_base/applications/kasablanca/debian/manpages
index 8ae2d25f3..8ae2d25f3 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/manpages
+++ b/ubuntu/_base/applications/kasablanca/debian/manpages
diff --git a/ubuntu/maverick/applications/kasablanca/debian/menu b/ubuntu/_base/applications/kasablanca/debian/menu
index 2b2588878..2b2588878 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/menu
+++ b/ubuntu/_base/applications/kasablanca/debian/menu
diff --git a/ubuntu/maverick/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff b/ubuntu/_base/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/applications/kasablanca/debian/patches/06_disable_no_undefined.diff b/ubuntu/_base/applications/kasablanca/debian/patches/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/patches/06_disable_no_undefined.diff
+++ b/ubuntu/_base/applications/kasablanca/debian/patches/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/applications/kasablanca/debian/patches/series b/ubuntu/_base/applications/kasablanca/debian/patches/series
index b8743ddd9..b8743ddd9 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/patches/series
+++ b/ubuntu/_base/applications/kasablanca/debian/patches/series
diff --git a/ubuntu/maverick/applications/kasablanca/debian/rules b/ubuntu/_base/applications/kasablanca/debian/rules
index da587ae58..da587ae58 100755
--- a/ubuntu/maverick/applications/kasablanca/debian/rules
+++ b/ubuntu/_base/applications/kasablanca/debian/rules
diff --git a/ubuntu/maverick/applications/kasablanca/debian/source.lintian-overrides b/ubuntu/_base/applications/kasablanca/debian/source.lintian-overrides
index 7349addb4..7349addb4 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/source.lintian-overrides
+++ b/ubuntu/_base/applications/kasablanca/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/applications/kasablanca/debian/source/format b/ubuntu/_base/applications/kasablanca/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/source/format
+++ b/ubuntu/_base/applications/kasablanca/debian/source/format
diff --git a/ubuntu/maverick/applications/kasablanca/debian/source/options b/ubuntu/_base/applications/kasablanca/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/source/options
+++ b/ubuntu/_base/applications/kasablanca/debian/source/options
diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/katapult/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk b/ubuntu/_base/applications/katapult/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/katapult/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/versions.pl b/ubuntu/_base/applications/katapult/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/katapult/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/katapult/debian/changelog b/ubuntu/_base/applications/katapult/debian/changelog
index 4452b8a56..4452b8a56 100644
--- a/ubuntu/maverick/applications/katapult/debian/changelog
+++ b/ubuntu/_base/applications/katapult/debian/changelog
diff --git a/ubuntu/maverick/applications/katapult/debian/compat b/ubuntu/_base/applications/katapult/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/katapult/debian/compat
+++ b/ubuntu/_base/applications/katapult/debian/compat
diff --git a/ubuntu/maverick/applications/katapult/debian/control b/ubuntu/_base/applications/katapult/debian/control
index 2ae863c6a..2ae863c6a 100644
--- a/ubuntu/maverick/applications/katapult/debian/control
+++ b/ubuntu/_base/applications/katapult/debian/control
diff --git a/ubuntu/maverick/applications/katapult/debian/copyright b/ubuntu/_base/applications/katapult/debian/copyright
index fa75bbec3..fa75bbec3 100644
--- a/ubuntu/maverick/applications/katapult/debian/copyright
+++ b/ubuntu/_base/applications/katapult/debian/copyright
diff --git a/ubuntu/maverick/applications/katapult/debian/docs b/ubuntu/_base/applications/katapult/debian/docs
index 04f70e688..04f70e688 100644
--- a/ubuntu/maverick/applications/katapult/debian/docs
+++ b/ubuntu/_base/applications/katapult/debian/docs
diff --git a/ubuntu/maverick/applications/katapult/debian/katapult-trinity.lintian b/ubuntu/_base/applications/katapult/debian/katapult-trinity.lintian
index d7fcffa7b..d7fcffa7b 100644
--- a/ubuntu/maverick/applications/katapult/debian/katapult-trinity.lintian
+++ b/ubuntu/_base/applications/katapult/debian/katapult-trinity.lintian
diff --git a/ubuntu/maverick/applications/katapult/debian/menu b/ubuntu/_base/applications/katapult/debian/menu
index fcf7c082f..fcf7c082f 100644
--- a/ubuntu/maverick/applications/katapult/debian/menu
+++ b/ubuntu/_base/applications/katapult/debian/menu
diff --git a/ubuntu/maverick/applications/katapult/debian/patches/series b/ubuntu/_base/applications/katapult/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/katapult/debian/patches/series
+++ b/ubuntu/_base/applications/katapult/debian/patches/series
diff --git a/ubuntu/maverick/applications/katapult/debian/rules b/ubuntu/_base/applications/katapult/debian/rules
index c8db4135e..c8db4135e 100755
--- a/ubuntu/maverick/applications/katapult/debian/rules
+++ b/ubuntu/_base/applications/katapult/debian/rules
diff --git a/ubuntu/maverick/applications/katapult/debian/source/format b/ubuntu/_base/applications/katapult/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/katapult/debian/source/format
+++ b/ubuntu/_base/applications/katapult/debian/source/format
diff --git a/ubuntu/maverick/applications/katapult/debian/source/options b/ubuntu/_base/applications/katapult/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/katapult/debian/source/options
+++ b/ubuntu/_base/applications/katapult/debian/source/options
diff --git a/ubuntu/maverick/applications/kbarcode/debian/README.Debian b/ubuntu/_base/applications/kbarcode/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/README.Debian
+++ b/ubuntu/_base/applications/kbarcode/debian/README.Debian
diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk b/ubuntu/_base/applications/kbarcode/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kbarcode/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/versions.pl b/ubuntu/_base/applications/kbarcode/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kbarcode/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kbarcode/debian/changelog b/ubuntu/_base/applications/kbarcode/debian/changelog
index df15715c2..df15715c2 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/changelog
+++ b/ubuntu/_base/applications/kbarcode/debian/changelog
diff --git a/ubuntu/maverick/applications/kbarcode/debian/compat b/ubuntu/_base/applications/kbarcode/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/compat
+++ b/ubuntu/_base/applications/kbarcode/debian/compat
diff --git a/ubuntu/maverick/applications/kbarcode/debian/control b/ubuntu/_base/applications/kbarcode/debian/control
index 6921040cc..6921040cc 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/control
+++ b/ubuntu/_base/applications/kbarcode/debian/control
diff --git a/ubuntu/maverick/applications/kbarcode/debian/copyright b/ubuntu/_base/applications/kbarcode/debian/copyright
index 37bf717a2..37bf717a2 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/copyright
+++ b/ubuntu/_base/applications/kbarcode/debian/copyright
diff --git a/ubuntu/maverick/applications/kbarcode/debian/docs b/ubuntu/_base/applications/kbarcode/debian/docs
index c17f03764..c17f03764 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/docs
+++ b/ubuntu/_base/applications/kbarcode/debian/docs
diff --git a/ubuntu/maverick/applications/kbarcode/debian/menu b/ubuntu/_base/applications/kbarcode/debian/menu
index 33f4f83da..33f4f83da 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/menu
+++ b/ubuntu/_base/applications/kbarcode/debian/menu
diff --git a/ubuntu/maverick/applications/kbarcode/debian/patches/.gitignore b/ubuntu/_base/applications/kbarcode/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/kbarcode/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kbarcode/debian/rules b/ubuntu/_base/applications/kbarcode/debian/rules
index e5c16cf8a..e5c16cf8a 100755
--- a/ubuntu/maverick/applications/kbarcode/debian/rules
+++ b/ubuntu/_base/applications/kbarcode/debian/rules
diff --git a/ubuntu/maverick/applications/kbarcode/debian/source/format b/ubuntu/_base/applications/kbarcode/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/source/format
+++ b/ubuntu/_base/applications/kbarcode/debian/source/format
diff --git a/ubuntu/maverick/applications/kbarcode/debian/source/options b/ubuntu/_base/applications/kbarcode/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/source/options
+++ b/ubuntu/_base/applications/kbarcode/debian/source/options
diff --git a/ubuntu/maverick/applications/kbfx/debian/README.Debian b/ubuntu/_base/applications/kbfx/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/applications/kbfx/debian/README.Debian
+++ b/ubuntu/_base/applications/kbfx/debian/README.Debian
diff --git a/ubuntu/maverick/applications/kbfx/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kbfx/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kbfx/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kbfx/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk b/ubuntu/_base/applications/kbfx/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kbfx/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kbfx/debian/cdbs/versions.pl b/ubuntu/_base/applications/kbfx/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kbfx/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kbfx/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kbfx/debian/changelog b/ubuntu/_base/applications/kbfx/debian/changelog
index cbb743bf9..cbb743bf9 100644
--- a/ubuntu/maverick/applications/kbfx/debian/changelog
+++ b/ubuntu/_base/applications/kbfx/debian/changelog
diff --git a/ubuntu/maverick/applications/kbfx/debian/compat b/ubuntu/_base/applications/kbfx/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kbfx/debian/compat
+++ b/ubuntu/_base/applications/kbfx/debian/compat
diff --git a/ubuntu/maverick/applications/kbfx/debian/control b/ubuntu/_base/applications/kbfx/debian/control
index fc1871951..fc1871951 100644
--- a/ubuntu/maverick/applications/kbfx/debian/control
+++ b/ubuntu/_base/applications/kbfx/debian/control
diff --git a/ubuntu/maverick/applications/kbfx/debian/copyright b/ubuntu/_base/applications/kbfx/debian/copyright
index ccc7bcf80..ccc7bcf80 100644
--- a/ubuntu/maverick/applications/kbfx/debian/copyright
+++ b/ubuntu/_base/applications/kbfx/debian/copyright
diff --git a/ubuntu/maverick/applications/kbfx/debian/docs b/ubuntu/_base/applications/kbfx/debian/docs
index 4182e08ae..4182e08ae 100644
--- a/ubuntu/maverick/applications/kbfx/debian/docs
+++ b/ubuntu/_base/applications/kbfx/debian/docs
diff --git a/ubuntu/maverick/applications/kbfx/debian/kbfx-trinity.lintian b/ubuntu/_base/applications/kbfx/debian/kbfx-trinity.lintian
index 35c40e0a1..35c40e0a1 100644
--- a/ubuntu/maverick/applications/kbfx/debian/kbfx-trinity.lintian
+++ b/ubuntu/_base/applications/kbfx/debian/kbfx-trinity.lintian
diff --git a/ubuntu/maverick/applications/kbfx/debian/patches/series b/ubuntu/_base/applications/kbfx/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kbfx/debian/patches/series
+++ b/ubuntu/_base/applications/kbfx/debian/patches/series
diff --git a/ubuntu/maverick/applications/kbfx/debian/postinst b/ubuntu/_base/applications/kbfx/debian/postinst
index e95a6906b..e95a6906b 100644
--- a/ubuntu/maverick/applications/kbfx/debian/postinst
+++ b/ubuntu/_base/applications/kbfx/debian/postinst
diff --git a/ubuntu/maverick/applications/kbfx/debian/rules b/ubuntu/_base/applications/kbfx/debian/rules
index 2f11c867e..2f11c867e 100755
--- a/ubuntu/maverick/applications/kbfx/debian/rules
+++ b/ubuntu/_base/applications/kbfx/debian/rules
diff --git a/ubuntu/maverick/applications/kbfx/debian/source/format b/ubuntu/_base/applications/kbfx/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kbfx/debian/source/format
+++ b/ubuntu/_base/applications/kbfx/debian/source/format
diff --git a/ubuntu/maverick/applications/kbfx/debian/source/options b/ubuntu/_base/applications/kbfx/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kbfx/debian/source/options
+++ b/ubuntu/_base/applications/kbfx/debian/source/options
diff --git a/ubuntu/maverick/applications/kbfx/debian/watch b/ubuntu/_base/applications/kbfx/debian/watch
index 4052e514a..4052e514a 100644
--- a/ubuntu/maverick/applications/kbfx/debian/watch
+++ b/ubuntu/_base/applications/kbfx/debian/watch
diff --git a/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk b/ubuntu/_base/applications/kbibtex/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kbibtex/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kbibtex/debian/cdbs/versions.pl b/ubuntu/_base/applications/kbibtex/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kbibtex/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kbibtex/debian/changelog b/ubuntu/_base/applications/kbibtex/debian/changelog
index c06f2a183..c06f2a183 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/changelog
+++ b/ubuntu/_base/applications/kbibtex/debian/changelog
diff --git a/ubuntu/maverick/applications/kbibtex/debian/compat b/ubuntu/_base/applications/kbibtex/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/compat
+++ b/ubuntu/_base/applications/kbibtex/debian/compat
diff --git a/ubuntu/maverick/applications/kbibtex/debian/control b/ubuntu/_base/applications/kbibtex/debian/control
index ece779a30..ece779a30 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/control
+++ b/ubuntu/_base/applications/kbibtex/debian/control
diff --git a/ubuntu/maverick/applications/kbibtex/debian/copyright b/ubuntu/_base/applications/kbibtex/debian/copyright
index a3860eab7..a3860eab7 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/copyright
+++ b/ubuntu/_base/applications/kbibtex/debian/copyright
diff --git a/ubuntu/maverick/applications/kbibtex/debian/docs b/ubuntu/_base/applications/kbibtex/debian/docs
index ba6c8ac4b..ba6c8ac4b 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/docs
+++ b/ubuntu/_base/applications/kbibtex/debian/docs
diff --git a/ubuntu/maverick/applications/kbibtex/debian/menu b/ubuntu/_base/applications/kbibtex/debian/menu
index 9a7ef0015..9a7ef0015 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/menu
+++ b/ubuntu/_base/applications/kbibtex/debian/menu
diff --git a/ubuntu/maverick/applications/kbibtex/debian/rules b/ubuntu/_base/applications/kbibtex/debian/rules
index e5c16cf8a..e5c16cf8a 100755
--- a/ubuntu/maverick/applications/kbibtex/debian/rules
+++ b/ubuntu/_base/applications/kbibtex/debian/rules
diff --git a/ubuntu/maverick/applications/kbibtex/debian/source/format b/ubuntu/_base/applications/kbibtex/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/source/format
+++ b/ubuntu/_base/applications/kbibtex/debian/source/format
diff --git a/ubuntu/maverick/applications/kbibtex/debian/source/options b/ubuntu/_base/applications/kbibtex/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/source/options
+++ b/ubuntu/_base/applications/kbibtex/debian/source/options
diff --git a/ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kbiff/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kbiff/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kbiff/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kbiff/debian/cdbs/kde.mk b/ubuntu/_base/applications/kbiff/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kbiff/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kbiff/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kbiff/debian/cdbs/versions.pl b/ubuntu/_base/applications/kbiff/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kbiff/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kbiff/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kbiff/debian/changelog b/ubuntu/_base/applications/kbiff/debian/changelog
index bf7871f3b..bf7871f3b 100644
--- a/ubuntu/maverick/applications/kbiff/debian/changelog
+++ b/ubuntu/_base/applications/kbiff/debian/changelog
diff --git a/ubuntu/maverick/applications/kbiff/debian/compat b/ubuntu/_base/applications/kbiff/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kbiff/debian/compat
+++ b/ubuntu/_base/applications/kbiff/debian/compat
diff --git a/ubuntu/maverick/applications/kbiff/debian/control b/ubuntu/_base/applications/kbiff/debian/control
index 1667ae8d6..1667ae8d6 100644
--- a/ubuntu/maverick/applications/kbiff/debian/control
+++ b/ubuntu/_base/applications/kbiff/debian/control
diff --git a/ubuntu/maverick/applications/kbiff/debian/copyright b/ubuntu/_base/applications/kbiff/debian/copyright
index f2ff3daec..f2ff3daec 100644
--- a/ubuntu/maverick/applications/kbiff/debian/copyright
+++ b/ubuntu/_base/applications/kbiff/debian/copyright
diff --git a/ubuntu/maverick/applications/kbiff/debian/dirs b/ubuntu/_base/applications/kbiff/debian/dirs
index f583045fe..f583045fe 100644
--- a/ubuntu/maverick/applications/kbiff/debian/dirs
+++ b/ubuntu/_base/applications/kbiff/debian/dirs
diff --git a/ubuntu/maverick/applications/kbiff/debian/docs b/ubuntu/_base/applications/kbiff/debian/docs
index 6f83607c1..6f83607c1 100644
--- a/ubuntu/maverick/applications/kbiff/debian/docs
+++ b/ubuntu/_base/applications/kbiff/debian/docs
diff --git a/ubuntu/maverick/applications/kbiff/debian/menu b/ubuntu/_base/applications/kbiff/debian/menu
index fdfa26c26..fdfa26c26 100644
--- a/ubuntu/maverick/applications/kbiff/debian/menu
+++ b/ubuntu/_base/applications/kbiff/debian/menu
diff --git a/ubuntu/maverick/applications/kbiff/debian/rules b/ubuntu/_base/applications/kbiff/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kbiff/debian/rules
+++ b/ubuntu/_base/applications/kbiff/debian/rules
diff --git a/ubuntu/maverick/applications/kbiff/debian/source/format b/ubuntu/_base/applications/kbiff/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kbiff/debian/source/format
+++ b/ubuntu/_base/applications/kbiff/debian/source/format
diff --git a/ubuntu/maverick/applications/kbiff/debian/source/options b/ubuntu/_base/applications/kbiff/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kbiff/debian/source/options
+++ b/ubuntu/_base/applications/kbiff/debian/source/options
diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk b/ubuntu/_base/applications/kbookreader/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kbookreader/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/versions.pl b/ubuntu/_base/applications/kbookreader/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kbookreader/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kbookreader/debian/changelog b/ubuntu/_base/applications/kbookreader/debian/changelog
index 2d836d558..2d836d558 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/changelog
+++ b/ubuntu/_base/applications/kbookreader/debian/changelog
diff --git a/ubuntu/maverick/applications/kbookreader/debian/compat b/ubuntu/_base/applications/kbookreader/debian/compat
index 4d446d8de..4d446d8de 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/compat
+++ b/ubuntu/_base/applications/kbookreader/debian/compat
diff --git a/ubuntu/maverick/applications/kbookreader/debian/control b/ubuntu/_base/applications/kbookreader/debian/control
index 05d9fcf68..05d9fcf68 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/control
+++ b/ubuntu/_base/applications/kbookreader/debian/control
diff --git a/ubuntu/maverick/applications/kbookreader/debian/copyright b/ubuntu/_base/applications/kbookreader/debian/copyright
index 8d31bf1da..8d31bf1da 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/copyright
+++ b/ubuntu/_base/applications/kbookreader/debian/copyright
diff --git a/ubuntu/maverick/applications/kbookreader/debian/docs b/ubuntu/_base/applications/kbookreader/debian/docs
index 7d96d4e7e..7d96d4e7e 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/docs
+++ b/ubuntu/_base/applications/kbookreader/debian/docs
diff --git a/ubuntu/maverick/applications/kbookreader/debian/patches/series b/ubuntu/_base/applications/kbookreader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/patches/series
+++ b/ubuntu/_base/applications/kbookreader/debian/patches/series
diff --git a/ubuntu/maverick/applications/kbookreader/debian/rules b/ubuntu/_base/applications/kbookreader/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kbookreader/debian/rules
+++ b/ubuntu/_base/applications/kbookreader/debian/rules
diff --git a/ubuntu/maverick/applications/kbookreader/debian/source/format b/ubuntu/_base/applications/kbookreader/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/source/format
+++ b/ubuntu/_base/applications/kbookreader/debian/source/format
diff --git a/ubuntu/maverick/applications/kbookreader/debian/source/options b/ubuntu/_base/applications/kbookreader/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/source/options
+++ b/ubuntu/_base/applications/kbookreader/debian/source/options
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1 b/ubuntu/_base/applications/kchmviewer/debian/additions/kchmviewer.1
index 5994f536f..5994f536f 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1
+++ b/ubuntu/_base/applications/kchmviewer/debian/additions/kchmviewer.1
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/changelog b/ubuntu/_base/applications/kchmviewer/debian/changelog
index 91fe29383..91fe29383 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/changelog
+++ b/ubuntu/_base/applications/kchmviewer/debian/changelog
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/compat b/ubuntu/_base/applications/kchmviewer/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/compat
+++ b/ubuntu/_base/applications/kchmviewer/debian/compat
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/control b/ubuntu/_base/applications/kchmviewer/debian/control
index 59b2717d8..59b2717d8 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/control
+++ b/ubuntu/_base/applications/kchmviewer/debian/control
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/copyright b/ubuntu/_base/applications/kchmviewer/debian/copyright
index b221828b7..b221828b7 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/copyright
+++ b/ubuntu/_base/applications/kchmviewer/debian/copyright
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs b/ubuntu/_base/applications/kchmviewer/debian/debiandirs
index a190453fb..a190453fb 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
+++ b/ubuntu/_base/applications/kchmviewer/debian/debiandirs
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/dirs b/ubuntu/_base/applications/kchmviewer/debian/dirs
index 9d345cd36..9d345cd36 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/dirs
+++ b/ubuntu/_base/applications/kchmviewer/debian/dirs
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages b/ubuntu/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
index eb0e0bf59..eb0e0bf59 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
+++ b/ubuntu/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/manpages b/ubuntu/_base/applications/kchmviewer/debian/manpages
index eb0e0bf59..eb0e0bf59 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/manpages
+++ b/ubuntu/_base/applications/kchmviewer/debian/manpages
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/menu b/ubuntu/_base/applications/kchmviewer/debian/menu
index 694dda9e9..694dda9e9 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/menu
+++ b/ubuntu/_base/applications/kchmviewer/debian/menu
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/patches/.gitignore b/ubuntu/_base/applications/kchmviewer/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/kchmviewer/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/rules b/ubuntu/_base/applications/kchmviewer/debian/rules
index 4766ace5a..4766ace5a 100755
--- a/ubuntu/maverick/applications/kchmviewer/debian/rules
+++ b/ubuntu/_base/applications/kchmviewer/debian/rules
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/source/format b/ubuntu/_base/applications/kchmviewer/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/source/format
+++ b/ubuntu/_base/applications/kchmviewer/debian/source/format
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/source/options b/ubuntu/_base/applications/kchmviewer/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/source/options
+++ b/ubuntu/_base/applications/kchmviewer/debian/source/options
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/watch b/ubuntu/_base/applications/kchmviewer/debian/watch
index e55a5c924..e55a5c924 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/watch
+++ b/ubuntu/_base/applications/kchmviewer/debian/watch
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/cdbs/kde.mk b/ubuntu/_base/applications/kcmautostart/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kcmautostart/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/cdbs/versions.pl b/ubuntu/_base/applications/kcmautostart/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kcmautostart/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/changelog b/ubuntu/_base/applications/kcmautostart/debian/changelog
index 783882b27..783882b27 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/changelog
+++ b/ubuntu/_base/applications/kcmautostart/debian/changelog
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/compat b/ubuntu/_base/applications/kcmautostart/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/compat
+++ b/ubuntu/_base/applications/kcmautostart/debian/compat
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/control b/ubuntu/_base/applications/kcmautostart/debian/control
index 790e46433..790e46433 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/control
+++ b/ubuntu/_base/applications/kcmautostart/debian/control
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/copyright b/ubuntu/_base/applications/kcmautostart/debian/copyright
index 68eb13461..68eb13461 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/copyright
+++ b/ubuntu/_base/applications/kcmautostart/debian/copyright
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/docs b/ubuntu/_base/applications/kcmautostart/debian/docs
index 62deb0497..62deb0497 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/docs
+++ b/ubuntu/_base/applications/kcmautostart/debian/docs
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/patches/series b/ubuntu/_base/applications/kcmautostart/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/patches/series
+++ b/ubuntu/_base/applications/kcmautostart/debian/patches/series
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/rules b/ubuntu/_base/applications/kcmautostart/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kcmautostart/debian/rules
+++ b/ubuntu/_base/applications/kcmautostart/debian/rules
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/source/format b/ubuntu/_base/applications/kcmautostart/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/source/format
+++ b/ubuntu/_base/applications/kcmautostart/debian/source/format
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/source/options b/ubuntu/_base/applications/kcmautostart/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/source/options
+++ b/ubuntu/_base/applications/kcmautostart/debian/source/options
diff --git a/ubuntu/maverick/applications/kcmldap/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kcmldap/debian/cdbs/kde.mk b/ubuntu/_base/applications/kcmldap/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kcmldap/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kcmldap/debian/cdbs/versions.pl b/ubuntu/_base/applications/kcmldap/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kcmldap/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kcmldap/debian/changelog b/ubuntu/_base/applications/kcmldap/debian/changelog
index 3f63980d6..3f63980d6 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/changelog
+++ b/ubuntu/_base/applications/kcmldap/debian/changelog
diff --git a/ubuntu/maverick/applications/kcmldap/debian/compat b/ubuntu/_base/applications/kcmldap/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/compat
+++ b/ubuntu/_base/applications/kcmldap/debian/compat
diff --git a/ubuntu/maverick/applications/kcmldap/debian/control b/ubuntu/_base/applications/kcmldap/debian/control
index 1222645ca..1222645ca 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/control
+++ b/ubuntu/_base/applications/kcmldap/debian/control
diff --git a/ubuntu/maverick/applications/kcmldap/debian/copyright b/ubuntu/_base/applications/kcmldap/debian/copyright
index 540709e87..540709e87 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/copyright
+++ b/ubuntu/_base/applications/kcmldap/debian/copyright
diff --git a/ubuntu/maverick/applications/kcmldap/debian/docs b/ubuntu/_base/applications/kcmldap/debian/docs
index 62deb0497..62deb0497 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/docs
+++ b/ubuntu/_base/applications/kcmldap/debian/docs
diff --git a/ubuntu/maverick/applications/kcmldap/debian/kcontrol-ldap-bonding-trinity.install b/ubuntu/_base/applications/kcmldap/debian/kcontrol-ldap-bonding-trinity.install
index f7419c415..f7419c415 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/kcontrol-ldap-bonding-trinity.install
+++ b/ubuntu/_base/applications/kcmldap/debian/kcontrol-ldap-bonding-trinity.install
diff --git a/ubuntu/maverick/applications/kcmldap/debian/patches/series b/ubuntu/_base/applications/kcmldap/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/patches/series
+++ b/ubuntu/_base/applications/kcmldap/debian/patches/series
diff --git a/ubuntu/maverick/applications/kcmldap/debian/rules b/ubuntu/_base/applications/kcmldap/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kcmldap/debian/rules
+++ b/ubuntu/_base/applications/kcmldap/debian/rules
diff --git a/ubuntu/maverick/applications/kcmldap/debian/source/format b/ubuntu/_base/applications/kcmldap/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/source/format
+++ b/ubuntu/_base/applications/kcmldap/debian/source/format
diff --git a/ubuntu/maverick/applications/kcmldap/debian/source/options b/ubuntu/_base/applications/kcmldap/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/source/options
+++ b/ubuntu/_base/applications/kcmldap/debian/source/options
diff --git a/ubuntu/maverick/applications/kcmldap/debian/tde-ldap-cert-updater.init b/ubuntu/_base/applications/kcmldap/debian/tde-ldap-cert-updater.init
index 4a2ef03ad..4a2ef03ad 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/tde-ldap-cert-updater.init
+++ b/ubuntu/_base/applications/kcmldap/debian/tde-ldap-cert-updater.init
diff --git a/ubuntu/maverick/applications/kcmldap/debian/tde-ldap-cert-updater.install b/ubuntu/_base/applications/kcmldap/debian/tde-ldap-cert-updater.install
index b9d6aad5b..b9d6aad5b 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/tde-ldap-cert-updater.install
+++ b/ubuntu/_base/applications/kcmldap/debian/tde-ldap-cert-updater.install
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/changelog b/ubuntu/_base/applications/kcmldapcontroller/debian/changelog
index 7481449f5..7481449f5 100644
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/changelog
+++ b/ubuntu/_base/applications/kcmldapcontroller/debian/changelog
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/compat b/ubuntu/_base/applications/kcmldapcontroller/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/compat
+++ b/ubuntu/_base/applications/kcmldapcontroller/debian/compat
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/control b/ubuntu/_base/applications/kcmldapcontroller/debian/control
index c68333334..c68333334 100644
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/control
+++ b/ubuntu/_base/applications/kcmldapcontroller/debian/control
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/copyright b/ubuntu/_base/applications/kcmldapcontroller/debian/copyright
index 540709e87..540709e87 100644
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/copyright
+++ b/ubuntu/_base/applications/kcmldapcontroller/debian/copyright
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/patches/series b/ubuntu/_base/applications/kcmldapcontroller/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/patches/series
+++ b/ubuntu/_base/applications/kcmldapcontroller/debian/patches/series
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/rules b/ubuntu/_base/applications/kcmldapcontroller/debian/rules
index 272168641..272168641 100755
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/rules
+++ b/ubuntu/_base/applications/kcmldapcontroller/debian/rules
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/source/format b/ubuntu/_base/applications/kcmldapcontroller/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/source/format
+++ b/ubuntu/_base/applications/kcmldapcontroller/debian/source/format
diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/source/options b/ubuntu/_base/applications/kcmldapcontroller/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/source/options
+++ b/ubuntu/_base/applications/kcmldapcontroller/debian/source/options
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/cdbs/kde.mk b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/cdbs/versions.pl b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/changelog b/ubuntu/_base/applications/kcmldapmanager/debian/changelog
index 875ca6e67..875ca6e67 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/changelog
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/changelog
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/compat b/ubuntu/_base/applications/kcmldapmanager/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/compat
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/compat
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/control b/ubuntu/_base/applications/kcmldapmanager/debian/control
index 3b2ef2813..3b2ef2813 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/control
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/control
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/copyright b/ubuntu/_base/applications/kcmldapmanager/debian/copyright
index 540709e87..540709e87 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/copyright
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/copyright
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/docs b/ubuntu/_base/applications/kcmldapmanager/debian/docs
index 62deb0497..62deb0497 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/docs
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/docs
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/patches/series b/ubuntu/_base/applications/kcmldapmanager/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/patches/series
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/patches/series
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/rules b/ubuntu/_base/applications/kcmldapmanager/debian/rules
index e5c16cf8a..e5c16cf8a 100755
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/rules
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/rules
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/source/format b/ubuntu/_base/applications/kcmldapmanager/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/source/format
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/source/format
diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/source/options b/ubuntu/_base/applications/kcmldapmanager/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/source/options
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/source/options
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/_base/applications/kcpuload/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kcpuload/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/versions.pl b/ubuntu/_base/applications/kcpuload/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kcpuload/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kcpuload/debian/changelog b/ubuntu/_base/applications/kcpuload/debian/changelog
index d1d932a9d..d1d932a9d 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/changelog
+++ b/ubuntu/_base/applications/kcpuload/debian/changelog
diff --git a/ubuntu/maverick/applications/kcpuload/debian/compat b/ubuntu/_base/applications/kcpuload/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/compat
+++ b/ubuntu/_base/applications/kcpuload/debian/compat
diff --git a/ubuntu/maverick/applications/kcpuload/debian/control b/ubuntu/_base/applications/kcpuload/debian/control
index 035564cda..035564cda 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/control
+++ b/ubuntu/_base/applications/kcpuload/debian/control
diff --git a/ubuntu/maverick/applications/kcpuload/debian/copyright b/ubuntu/_base/applications/kcpuload/debian/copyright
index a5ee5d69c..a5ee5d69c 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/copyright
+++ b/ubuntu/_base/applications/kcpuload/debian/copyright
diff --git a/ubuntu/maverick/applications/kcpuload/debian/doc-base b/ubuntu/_base/applications/kcpuload/debian/doc-base
index ad25937a7..ad25937a7 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/doc-base
+++ b/ubuntu/_base/applications/kcpuload/debian/doc-base
diff --git a/ubuntu/maverick/applications/kcpuload/debian/docs b/ubuntu/_base/applications/kcpuload/debian/docs
index 236c99a31..236c99a31 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/docs
+++ b/ubuntu/_base/applications/kcpuload/debian/docs
diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.install b/ubuntu/_base/applications/kcpuload/debian/kcpuload-trinity.install
index d3c2fb81c..d3c2fb81c 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.install
+++ b/ubuntu/_base/applications/kcpuload/debian/kcpuload-trinity.install
diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.lintian b/ubuntu/_base/applications/kcpuload/debian/kcpuload-trinity.lintian
index d53421bab..d53421bab 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload-trinity.lintian
+++ b/ubuntu/_base/applications/kcpuload/debian/kcpuload-trinity.lintian
diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.xpm b/ubuntu/_base/applications/kcpuload/debian/kcpuload.xpm
index 3c49eab7e..3c49eab7e 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.xpm
+++ b/ubuntu/_base/applications/kcpuload/debian/kcpuload.xpm
diff --git a/ubuntu/maverick/applications/kcpuload/debian/links b/ubuntu/_base/applications/kcpuload/debian/links
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/links
+++ b/ubuntu/_base/applications/kcpuload/debian/links
diff --git a/ubuntu/maverick/applications/kcpuload/debian/menu b/ubuntu/_base/applications/kcpuload/debian/menu
index 88ff824b6..88ff824b6 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/menu
+++ b/ubuntu/_base/applications/kcpuload/debian/menu
diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/_base/applications/kcpuload/debian/rules
index f403b6ec3..f403b6ec3 100755
--- a/ubuntu/maverick/applications/kcpuload/debian/rules
+++ b/ubuntu/_base/applications/kcpuload/debian/rules
diff --git a/ubuntu/maverick/applications/kcpuload/debian/source/format b/ubuntu/_base/applications/kcpuload/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/source/format
+++ b/ubuntu/_base/applications/kcpuload/debian/source/format
diff --git a/ubuntu/maverick/applications/kcpuload/debian/source/options b/ubuntu/_base/applications/kcpuload/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/source/options
+++ b/ubuntu/_base/applications/kcpuload/debian/source/options
diff --git a/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kdbg/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kdbg/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk b/ubuntu/_base/applications/kdbg/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kdbg/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kdbg/debian/cdbs/versions.pl b/ubuntu/_base/applications/kdbg/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kdbg/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kdbg/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kdbg/debian/changelog b/ubuntu/_base/applications/kdbg/debian/changelog
index 85cee798e..85cee798e 100644
--- a/ubuntu/maverick/applications/kdbg/debian/changelog
+++ b/ubuntu/_base/applications/kdbg/debian/changelog
diff --git a/ubuntu/maverick/applications/kdbg/debian/compat b/ubuntu/_base/applications/kdbg/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kdbg/debian/compat
+++ b/ubuntu/_base/applications/kdbg/debian/compat
diff --git a/ubuntu/maverick/applications/kdbg/debian/control b/ubuntu/_base/applications/kdbg/debian/control
index c27796be1..c27796be1 100644
--- a/ubuntu/maverick/applications/kdbg/debian/control
+++ b/ubuntu/_base/applications/kdbg/debian/control
diff --git a/ubuntu/maverick/applications/kdbg/debian/copyright b/ubuntu/_base/applications/kdbg/debian/copyright
index ebf1e447c..ebf1e447c 100644
--- a/ubuntu/maverick/applications/kdbg/debian/copyright
+++ b/ubuntu/_base/applications/kdbg/debian/copyright
diff --git a/ubuntu/maverick/applications/kdbg/debian/doc-base b/ubuntu/_base/applications/kdbg/debian/doc-base
index 330debeb4..330debeb4 100644
--- a/ubuntu/maverick/applications/kdbg/debian/doc-base
+++ b/ubuntu/_base/applications/kdbg/debian/doc-base
diff --git a/ubuntu/maverick/applications/kdbg/debian/docs b/ubuntu/_base/applications/kdbg/debian/docs
index 2e58c4d34..2e58c4d34 100644
--- a/ubuntu/maverick/applications/kdbg/debian/docs
+++ b/ubuntu/_base/applications/kdbg/debian/docs
diff --git a/ubuntu/maverick/applications/kdbg/debian/kdbg.1 b/ubuntu/_base/applications/kdbg/debian/kdbg.1
index 588ef94db..588ef94db 100644
--- a/ubuntu/maverick/applications/kdbg/debian/kdbg.1
+++ b/ubuntu/_base/applications/kdbg/debian/kdbg.1
diff --git a/ubuntu/maverick/applications/kdbg/debian/kdbg.xpm b/ubuntu/_base/applications/kdbg/debian/kdbg.xpm
index 8df7ac5f7..8df7ac5f7 100644
--- a/ubuntu/maverick/applications/kdbg/debian/kdbg.xpm
+++ b/ubuntu/_base/applications/kdbg/debian/kdbg.xpm
diff --git a/ubuntu/maverick/applications/kdbg/debian/menu b/ubuntu/_base/applications/kdbg/debian/menu
index 19d373c41..19d373c41 100644
--- a/ubuntu/maverick/applications/kdbg/debian/menu
+++ b/ubuntu/_base/applications/kdbg/debian/menu
diff --git a/ubuntu/maverick/applications/kdbg/debian/rules b/ubuntu/_base/applications/kdbg/debian/rules
index 843f7443b..843f7443b 100755
--- a/ubuntu/maverick/applications/kdbg/debian/rules
+++ b/ubuntu/_base/applications/kdbg/debian/rules
diff --git a/ubuntu/maverick/applications/kdbg/debian/source/format b/ubuntu/_base/applications/kdbg/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kdbg/debian/source/format
+++ b/ubuntu/_base/applications/kdbg/debian/source/format
diff --git a/ubuntu/maverick/applications/kdbg/debian/source/options b/ubuntu/_base/applications/kdbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kdbg/debian/source/options
+++ b/ubuntu/_base/applications/kdbg/debian/source/options
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/versions.pl b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/changelog b/ubuntu/_base/applications/kdbusnotification/debian/changelog
index 3845c888d..3845c888d 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/changelog
+++ b/ubuntu/_base/applications/kdbusnotification/debian/changelog
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/compat b/ubuntu/_base/applications/kdbusnotification/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/compat
+++ b/ubuntu/_base/applications/kdbusnotification/debian/compat
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/control b/ubuntu/_base/applications/kdbusnotification/debian/control
index ab18cace2..ab18cace2 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/control
+++ b/ubuntu/_base/applications/kdbusnotification/debian/control
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/copyright b/ubuntu/_base/applications/kdbusnotification/debian/copyright
index 760904ce9..760904ce9 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/copyright
+++ b/ubuntu/_base/applications/kdbusnotification/debian/copyright
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/_base/applications/kdbusnotification/debian/rules
index e5c16cf8a..e5c16cf8a 100755
--- a/ubuntu/maverick/applications/kdbusnotification/debian/rules
+++ b/ubuntu/_base/applications/kdbusnotification/debian/rules
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/source/format b/ubuntu/_base/applications/kdbusnotification/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/source/format
+++ b/ubuntu/_base/applications/kdbusnotification/debian/source/format
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/source/options b/ubuntu/_base/applications/kdbusnotification/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/source/options
+++ b/ubuntu/_base/applications/kdbusnotification/debian/source/options
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/_base/applications/kdiff3/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kdiff3/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl b/ubuntu/_base/applications/kdiff3/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kdiff3/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kdiff3/debian/changelog b/ubuntu/_base/applications/kdiff3/debian/changelog
index f0215eada..f0215eada 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/changelog
+++ b/ubuntu/_base/applications/kdiff3/debian/changelog
diff --git a/ubuntu/maverick/applications/kdiff3/debian/compat b/ubuntu/_base/applications/kdiff3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/compat
+++ b/ubuntu/_base/applications/kdiff3/debian/compat
diff --git a/ubuntu/maverick/applications/kdiff3/debian/control b/ubuntu/_base/applications/kdiff3/debian/control
index e97c8b697..e97c8b697 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/control
+++ b/ubuntu/_base/applications/kdiff3/debian/control
diff --git a/ubuntu/maverick/applications/kdiff3/debian/copyright b/ubuntu/_base/applications/kdiff3/debian/copyright
index 05b7204fd..05b7204fd 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/copyright
+++ b/ubuntu/_base/applications/kdiff3/debian/copyright
diff --git a/ubuntu/maverick/applications/kdiff3/debian/docs b/ubuntu/_base/applications/kdiff3/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/docs
+++ b/ubuntu/_base/applications/kdiff3/debian/docs
diff --git a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
index 12c5677e6..12c5677e6 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
+++ b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
diff --git a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.install b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install
index 515c1099a..515c1099a 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.install
+++ b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install
diff --git a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links
index 8d3a5bde5..8d3a5bde5 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links
+++ b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links
diff --git a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.install b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.install
index 0a666b7b0..0a666b7b0 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.install
+++ b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.install
diff --git a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.sgml
index eaf1d947e..eaf1d947e 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml
+++ b/ubuntu/_base/applications/kdiff3/debian/kdiff3-trinity.sgml
diff --git a/ubuntu/maverick/applications/kdiff3/debian/patches/.gitignore b/ubuntu/_base/applications/kdiff3/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/kdiff3/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/_base/applications/kdiff3/debian/rules
index fed277103..fed277103 100755
--- a/ubuntu/maverick/applications/kdiff3/debian/rules
+++ b/ubuntu/_base/applications/kdiff3/debian/rules
diff --git a/ubuntu/maverick/applications/kdiff3/debian/source/format b/ubuntu/_base/applications/kdiff3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/source/format
+++ b/ubuntu/_base/applications/kdiff3/debian/source/format
diff --git a/ubuntu/maverick/applications/kdiff3/debian/source/options b/ubuntu/_base/applications/kdiff3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/source/options
+++ b/ubuntu/_base/applications/kdiff3/debian/source/options
diff --git a/ubuntu/maverick/applications/kdiff3/debian/watch b/ubuntu/_base/applications/kdiff3/debian/watch
index 1f8b23456..1f8b23456 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/watch
+++ b/ubuntu/_base/applications/kdiff3/debian/watch
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/_base/applications/kdirstat/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kdirstat/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/versions.pl b/ubuntu/_base/applications/kdirstat/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kdirstat/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kdirstat/debian/changelog b/ubuntu/_base/applications/kdirstat/debian/changelog
index bf0c6d43b..bf0c6d43b 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/changelog
+++ b/ubuntu/_base/applications/kdirstat/debian/changelog
diff --git a/ubuntu/maverick/applications/kdirstat/debian/compat b/ubuntu/_base/applications/kdirstat/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/compat
+++ b/ubuntu/_base/applications/kdirstat/debian/compat
diff --git a/ubuntu/maverick/applications/kdirstat/debian/control b/ubuntu/_base/applications/kdirstat/debian/control
index ee2e0ef40..ee2e0ef40 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/control
+++ b/ubuntu/_base/applications/kdirstat/debian/control
diff --git a/ubuntu/maverick/applications/kdirstat/debian/copyright b/ubuntu/_base/applications/kdirstat/debian/copyright
index 5230f7951..5230f7951 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/copyright
+++ b/ubuntu/_base/applications/kdirstat/debian/copyright
diff --git a/ubuntu/maverick/applications/kdirstat/debian/docs b/ubuntu/_base/applications/kdirstat/debian/docs
index 7f03542b1..7f03542b1 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/docs
+++ b/ubuntu/_base/applications/kdirstat/debian/docs
diff --git a/ubuntu/maverick/applications/kdirstat/debian/patches/series b/ubuntu/_base/applications/kdirstat/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/patches/series
+++ b/ubuntu/_base/applications/kdirstat/debian/patches/series
diff --git a/ubuntu/maverick/applications/kdirstat/debian/rules b/ubuntu/_base/applications/kdirstat/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kdirstat/debian/rules
+++ b/ubuntu/_base/applications/kdirstat/debian/rules
diff --git a/ubuntu/maverick/applications/kdirstat/debian/source/format b/ubuntu/_base/applications/kdirstat/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/source/format
+++ b/ubuntu/_base/applications/kdirstat/debian/source/format
diff --git a/ubuntu/maverick/applications/kdirstat/debian/source/options b/ubuntu/_base/applications/kdirstat/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/source/options
+++ b/ubuntu/_base/applications/kdirstat/debian/source/options
diff --git a/ubuntu/maverick/applications/kdpkg/debian/changelog b/ubuntu/_base/applications/kdpkg/debian/changelog
index 2c3e7dd4d..2c3e7dd4d 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/changelog
+++ b/ubuntu/_base/applications/kdpkg/debian/changelog
diff --git a/ubuntu/maverick/applications/kdpkg/debian/compat b/ubuntu/_base/applications/kdpkg/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/compat
+++ b/ubuntu/_base/applications/kdpkg/debian/compat
diff --git a/ubuntu/maverick/applications/kdpkg/debian/control b/ubuntu/_base/applications/kdpkg/debian/control
index 876bd2bf0..876bd2bf0 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/control
+++ b/ubuntu/_base/applications/kdpkg/debian/control
diff --git a/ubuntu/maverick/applications/kdpkg/debian/copyright b/ubuntu/_base/applications/kdpkg/debian/copyright
index a0a9c1d0d..a0a9c1d0d 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/copyright
+++ b/ubuntu/_base/applications/kdpkg/debian/copyright
diff --git a/ubuntu/maverick/applications/kdpkg/debian/kdpkg-install.1 b/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1
index c49586d4e..c49586d4e 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/kdpkg-install.1
+++ b/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1
diff --git a/ubuntu/maverick/applications/kdpkg/debian/kdpkg.1 b/ubuntu/_base/applications/kdpkg/debian/kdpkg.1
index c49586d4e..c49586d4e 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/kdpkg.1
+++ b/ubuntu/_base/applications/kdpkg/debian/kdpkg.1
diff --git a/ubuntu/maverick/applications/kdpkg/debian/manpages b/ubuntu/_base/applications/kdpkg/debian/manpages
index 7835ccb72..7835ccb72 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/manpages
+++ b/ubuntu/_base/applications/kdpkg/debian/manpages
diff --git a/ubuntu/maverick/applications/kdpkg/debian/patches/series b/ubuntu/_base/applications/kdpkg/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/patches/series
+++ b/ubuntu/_base/applications/kdpkg/debian/patches/series
diff --git a/ubuntu/maverick/applications/kdpkg/debian/rules b/ubuntu/_base/applications/kdpkg/debian/rules
index fc6797244..fc6797244 100755
--- a/ubuntu/maverick/applications/kdpkg/debian/rules
+++ b/ubuntu/_base/applications/kdpkg/debian/rules
diff --git a/ubuntu/maverick/applications/kdpkg/debian/source/format b/ubuntu/_base/applications/kdpkg/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/source/format
+++ b/ubuntu/_base/applications/kdpkg/debian/source/format
diff --git a/ubuntu/maverick/applications/kdpkg/debian/source/options b/ubuntu/_base/applications/kdpkg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kdpkg/debian/source/options
+++ b/ubuntu/_base/applications/kdpkg/debian/source/options
diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/keep/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/keep/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk b/ubuntu/_base/applications/keep/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/keep/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/versions.pl b/ubuntu/_base/applications/keep/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/keep/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/keep/debian/changelog b/ubuntu/_base/applications/keep/debian/changelog
index 4cbeb0449..4cbeb0449 100644
--- a/ubuntu/maverick/applications/keep/debian/changelog
+++ b/ubuntu/_base/applications/keep/debian/changelog
diff --git a/ubuntu/maverick/applications/keep/debian/compat b/ubuntu/_base/applications/keep/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/keep/debian/compat
+++ b/ubuntu/_base/applications/keep/debian/compat
diff --git a/ubuntu/maverick/applications/keep/debian/control b/ubuntu/_base/applications/keep/debian/control
index 2330b6b42..2330b6b42 100644
--- a/ubuntu/maverick/applications/keep/debian/control
+++ b/ubuntu/_base/applications/keep/debian/control
diff --git a/ubuntu/maverick/applications/keep/debian/copyright b/ubuntu/_base/applications/keep/debian/copyright
index ee2494fd8..ee2494fd8 100644
--- a/ubuntu/maverick/applications/keep/debian/copyright
+++ b/ubuntu/_base/applications/keep/debian/copyright
diff --git a/ubuntu/maverick/applications/keep/debian/docs b/ubuntu/_base/applications/keep/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/keep/debian/docs
+++ b/ubuntu/_base/applications/keep/debian/docs
diff --git a/ubuntu/maverick/applications/keep/debian/keep.xml b/ubuntu/_base/applications/keep/debian/keep.xml
index 0e97d35b3..0e97d35b3 100644
--- a/ubuntu/maverick/applications/keep/debian/keep.xml
+++ b/ubuntu/_base/applications/keep/debian/keep.xml
diff --git a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
index 696f9093c..696f9093c 100644
--- a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/applications/keep/debian/patches/series b/ubuntu/_base/applications/keep/debian/patches/series
index 9ccf4a125..9ccf4a125 100644
--- a/ubuntu/maverick/applications/keep/debian/patches/series
+++ b/ubuntu/_base/applications/keep/debian/patches/series
diff --git a/ubuntu/maverick/applications/keep/debian/rules b/ubuntu/_base/applications/keep/debian/rules
index 3a164d0ab..3a164d0ab 100755
--- a/ubuntu/maverick/applications/keep/debian/rules
+++ b/ubuntu/_base/applications/keep/debian/rules
diff --git a/ubuntu/maverick/applications/keep/debian/source/format b/ubuntu/_base/applications/keep/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/keep/debian/source/format
+++ b/ubuntu/_base/applications/keep/debian/source/format
diff --git a/ubuntu/maverick/applications/keep/debian/source/options b/ubuntu/_base/applications/keep/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/keep/debian/source/options
+++ b/ubuntu/_base/applications/keep/debian/source/options
diff --git a/ubuntu/maverick/applications/keep/debian/watch b/ubuntu/_base/applications/keep/debian/watch
index db207d2d8..db207d2d8 100644
--- a/ubuntu/maverick/applications/keep/debian/watch
+++ b/ubuntu/_base/applications/keep/debian/watch
diff --git a/ubuntu/maverick/applications/kerberostray/debian/changelog b/ubuntu/_base/applications/kerberostray/debian/changelog
index 2e7708282..2e7708282 100644
--- a/ubuntu/maverick/applications/kerberostray/debian/changelog
+++ b/ubuntu/_base/applications/kerberostray/debian/changelog
diff --git a/ubuntu/maverick/applications/kerberostray/debian/compat b/ubuntu/_base/applications/kerberostray/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kerberostray/debian/compat
+++ b/ubuntu/_base/applications/kerberostray/debian/compat
diff --git a/ubuntu/maverick/applications/kerberostray/debian/control b/ubuntu/_base/applications/kerberostray/debian/control
index f0ddc337e..f0ddc337e 100644
--- a/ubuntu/maverick/applications/kerberostray/debian/control
+++ b/ubuntu/_base/applications/kerberostray/debian/control
diff --git a/ubuntu/maverick/applications/kerberostray/debian/copyright b/ubuntu/_base/applications/kerberostray/debian/copyright
index 540709e87..540709e87 100644
--- a/ubuntu/maverick/applications/kerberostray/debian/copyright
+++ b/ubuntu/_base/applications/kerberostray/debian/copyright
diff --git a/ubuntu/maverick/applications/kerberostray/debian/patches/series b/ubuntu/_base/applications/kerberostray/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kerberostray/debian/patches/series
+++ b/ubuntu/_base/applications/kerberostray/debian/patches/series
diff --git a/ubuntu/maverick/applications/kerberostray/debian/rules b/ubuntu/_base/applications/kerberostray/debian/rules
index 272168641..272168641 100755
--- a/ubuntu/maverick/applications/kerberostray/debian/rules
+++ b/ubuntu/_base/applications/kerberostray/debian/rules
diff --git a/ubuntu/maverick/applications/kerberostray/debian/source/format b/ubuntu/_base/applications/kerberostray/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kerberostray/debian/source/format
+++ b/ubuntu/_base/applications/kerberostray/debian/source/format
diff --git a/ubuntu/maverick/applications/kerberostray/debian/source/options b/ubuntu/_base/applications/kerberostray/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kerberostray/debian/source/options
+++ b/ubuntu/_base/applications/kerberostray/debian/source/options
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 91a547ea9..91a547ea9 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kerry/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk b/ubuntu/_base/applications/kerry/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kerry/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/versions.pl b/ubuntu/_base/applications/kerry/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kerry/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kerry/debian/changelog b/ubuntu/_base/applications/kerry/debian/changelog
index 3f36fe40e..3f36fe40e 100644
--- a/ubuntu/maverick/applications/kerry/debian/changelog
+++ b/ubuntu/_base/applications/kerry/debian/changelog
diff --git a/ubuntu/maverick/applications/kerry/debian/compat b/ubuntu/_base/applications/kerry/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kerry/debian/compat
+++ b/ubuntu/_base/applications/kerry/debian/compat
diff --git a/ubuntu/maverick/applications/kerry/debian/control b/ubuntu/_base/applications/kerry/debian/control
index 191180cf7..191180cf7 100644
--- a/ubuntu/maverick/applications/kerry/debian/control
+++ b/ubuntu/_base/applications/kerry/debian/control
diff --git a/ubuntu/maverick/applications/kerry/debian/copyright b/ubuntu/_base/applications/kerry/debian/copyright
index 96a9180c9..96a9180c9 100644
--- a/ubuntu/maverick/applications/kerry/debian/copyright
+++ b/ubuntu/_base/applications/kerry/debian/copyright
diff --git a/ubuntu/maverick/applications/kerry/debian/kerry.1.docbook b/ubuntu/_base/applications/kerry/debian/kerry.1.docbook
index c286af6db..c286af6db 100644
--- a/ubuntu/maverick/applications/kerry/debian/kerry.1.docbook
+++ b/ubuntu/_base/applications/kerry/debian/kerry.1.docbook
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
index 7b06f8128..7b06f8128 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
+++ b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
index 896193aba..896193aba 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
+++ b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
index c4a705c68..c4a705c68 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
+++ b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/series b/ubuntu/_base/applications/kerry/debian/patches/series
index f23925f70..f23925f70 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/series
+++ b/ubuntu/_base/applications/kerry/debian/patches/series
diff --git a/ubuntu/maverick/applications/kerry/debian/postinst b/ubuntu/_base/applications/kerry/debian/postinst
index d0ff50431..d0ff50431 100644
--- a/ubuntu/maverick/applications/kerry/debian/postinst
+++ b/ubuntu/_base/applications/kerry/debian/postinst
diff --git a/ubuntu/maverick/applications/kerry/debian/postrm b/ubuntu/_base/applications/kerry/debian/postrm
index d1ae3b96c..d1ae3b96c 100644
--- a/ubuntu/maverick/applications/kerry/debian/postrm
+++ b/ubuntu/_base/applications/kerry/debian/postrm
diff --git a/ubuntu/maverick/applications/kerry/debian/rules b/ubuntu/_base/applications/kerry/debian/rules
index 7e44d25e2..7e44d25e2 100755
--- a/ubuntu/maverick/applications/kerry/debian/rules
+++ b/ubuntu/_base/applications/kerry/debian/rules
diff --git a/ubuntu/maverick/applications/kerry/debian/source/format b/ubuntu/_base/applications/kerry/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kerry/debian/source/format
+++ b/ubuntu/_base/applications/kerry/debian/source/format
diff --git a/ubuntu/maverick/applications/kerry/debian/source/options b/ubuntu/_base/applications/kerry/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kerry/debian/source/options
+++ b/ubuntu/_base/applications/kerry/debian/source/options
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/README.Debian b/ubuntu/_base/applications/kftpgrabber/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/README.Debian
+++ b/ubuntu/_base/applications/kftpgrabber/debian/README.Debian
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/kde.mk b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/versions.pl b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/changelog b/ubuntu/_base/applications/kftpgrabber/debian/changelog
index 448636493..448636493 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/changelog
+++ b/ubuntu/_base/applications/kftpgrabber/debian/changelog
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/compat b/ubuntu/_base/applications/kftpgrabber/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/compat
+++ b/ubuntu/_base/applications/kftpgrabber/debian/compat
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/control b/ubuntu/_base/applications/kftpgrabber/debian/control
index 2f32adb10..2f32adb10 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/control
+++ b/ubuntu/_base/applications/kftpgrabber/debian/control
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/copyright b/ubuntu/_base/applications/kftpgrabber/debian/copyright
index 1be4077df..1be4077df 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/copyright
+++ b/ubuntu/_base/applications/kftpgrabber/debian/copyright
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/docs b/ubuntu/_base/applications/kftpgrabber/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/docs
+++ b/ubuntu/_base/applications/kftpgrabber/debian/docs
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides b/ubuntu/_base/applications/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides
index db696c984..db696c984 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/kftpgrabber/debian/kftpgrabber-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/kftpgrabber.xml b/ubuntu/_base/applications/kftpgrabber/debian/kftpgrabber.xml
index ae9a1cc32..ae9a1cc32 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/kftpgrabber.xml
+++ b/ubuntu/_base/applications/kftpgrabber/debian/kftpgrabber.xml
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/manpages b/ubuntu/_base/applications/kftpgrabber/debian/manpages
index ac7779c7e..ac7779c7e 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/manpages
+++ b/ubuntu/_base/applications/kftpgrabber/debian/manpages
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/menu b/ubuntu/_base/applications/kftpgrabber/debian/menu
index 03baaac09..03baaac09 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/menu
+++ b/ubuntu/_base/applications/kftpgrabber/debian/menu
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/patches/series b/ubuntu/_base/applications/kftpgrabber/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/patches/series
+++ b/ubuntu/_base/applications/kftpgrabber/debian/patches/series
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/rules b/ubuntu/_base/applications/kftpgrabber/debian/rules
index b7b5591da..b7b5591da 100755
--- a/ubuntu/maverick/applications/kftpgrabber/debian/rules
+++ b/ubuntu/_base/applications/kftpgrabber/debian/rules
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/source/format b/ubuntu/_base/applications/kftpgrabber/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/source/format
+++ b/ubuntu/_base/applications/kftpgrabber/debian/source/format
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/source/options b/ubuntu/_base/applications/kftpgrabber/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/source/options
+++ b/ubuntu/_base/applications/kftpgrabber/debian/source/options
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/watch b/ubuntu/_base/applications/kftpgrabber/debian/watch
index a0f049d56..a0f049d56 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/watch
+++ b/ubuntu/_base/applications/kftpgrabber/debian/watch
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/versions.pl b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/changelog b/ubuntu/_base/applications/kgtk-qt3/debian/changelog
index e2c2e4920..e2c2e4920 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/changelog
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/changelog
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/compat b/ubuntu/_base/applications/kgtk-qt3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/compat
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/compat
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/control b/ubuntu/_base/applications/kgtk-qt3/debian/control
index 22734ec18..22734ec18 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/control
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/control
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/copyright b/ubuntu/_base/applications/kgtk-qt3/debian/copyright
index 0e93ef880..0e93ef880 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/copyright
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/copyright
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/ubuntu/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
index f7e4ea7f5..f7e4ea7f5 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/patches/series b/ubuntu/_base/applications/kgtk-qt3/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/patches/series
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/patches/series
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/preload b/ubuntu/_base/applications/kgtk-qt3/debian/preload
index 9508902de..9508902de 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/preload
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/preload
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/rules b/ubuntu/_base/applications/kgtk-qt3/debian/rules
index df246e2ae..df246e2ae 100755
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/rules
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/rules
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/source/format b/ubuntu/_base/applications/kgtk-qt3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/source/format
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/source/format
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/source/options b/ubuntu/_base/applications/kgtk-qt3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/source/options
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/source/options
diff --git a/ubuntu/maverick/applications/kile/debian/README.Debian b/ubuntu/_base/applications/kile/debian/README.Debian
index 5339affff..5339affff 100644
--- a/ubuntu/maverick/applications/kile/debian/README.Debian
+++ b/ubuntu/_base/applications/kile/debian/README.Debian
diff --git a/ubuntu/maverick/applications/kile/debian/TODO.Debian b/ubuntu/_base/applications/kile/debian/TODO.Debian
index 7fe556fd4..7fe556fd4 100644
--- a/ubuntu/maverick/applications/kile/debian/TODO.Debian
+++ b/ubuntu/_base/applications/kile/debian/TODO.Debian
diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kile/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kile/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk b/ubuntu/_base/applications/kile/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kile/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/versions.pl b/ubuntu/_base/applications/kile/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kile/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kile/debian/changelog b/ubuntu/_base/applications/kile/debian/changelog
index 046b3d786..046b3d786 100644
--- a/ubuntu/maverick/applications/kile/debian/changelog
+++ b/ubuntu/_base/applications/kile/debian/changelog
diff --git a/ubuntu/maverick/applications/kile/debian/compat b/ubuntu/_base/applications/kile/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kile/debian/compat
+++ b/ubuntu/_base/applications/kile/debian/compat
diff --git a/ubuntu/maverick/applications/kile/debian/control b/ubuntu/_base/applications/kile/debian/control
index 5330549d1..5330549d1 100644
--- a/ubuntu/maverick/applications/kile/debian/control
+++ b/ubuntu/_base/applications/kile/debian/control
diff --git a/ubuntu/maverick/applications/kile/debian/copyright b/ubuntu/_base/applications/kile/debian/copyright
index 513a8f2ca..513a8f2ca 100644
--- a/ubuntu/maverick/applications/kile/debian/copyright
+++ b/ubuntu/_base/applications/kile/debian/copyright
diff --git a/ubuntu/maverick/applications/kile/debian/docs b/ubuntu/_base/applications/kile/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/kile/debian/docs
+++ b/ubuntu/_base/applications/kile/debian/docs
diff --git a/ubuntu/maverick/applications/kile/debian/kile-trinity.install b/ubuntu/_base/applications/kile/debian/kile-trinity.install
index eb1b59da1..eb1b59da1 100644
--- a/ubuntu/maverick/applications/kile/debian/kile-trinity.install
+++ b/ubuntu/_base/applications/kile/debian/kile-trinity.install
diff --git a/ubuntu/maverick/applications/kile/debian/kile-trinity.links b/ubuntu/_base/applications/kile/debian/kile-trinity.links
index ebafda14f..ebafda14f 100644
--- a/ubuntu/maverick/applications/kile/debian/kile-trinity.links
+++ b/ubuntu/_base/applications/kile/debian/kile-trinity.links
diff --git a/ubuntu/maverick/applications/kile/debian/kile.1 b/ubuntu/_base/applications/kile/debian/kile.1
index d7609722c..d7609722c 100644
--- a/ubuntu/maverick/applications/kile/debian/kile.1
+++ b/ubuntu/_base/applications/kile/debian/kile.1
diff --git a/ubuntu/maverick/applications/kile/debian/kile.xpm b/ubuntu/_base/applications/kile/debian/kile.xpm
index 408d2710b..408d2710b 100644
--- a/ubuntu/maverick/applications/kile/debian/kile.xpm
+++ b/ubuntu/_base/applications/kile/debian/kile.xpm
diff --git a/ubuntu/maverick/applications/kile/debian/menu b/ubuntu/_base/applications/kile/debian/menu
index 380f16a88..380f16a88 100644
--- a/ubuntu/maverick/applications/kile/debian/menu
+++ b/ubuntu/_base/applications/kile/debian/menu
diff --git a/ubuntu/maverick/applications/kile/debian/patches/.gitignore b/ubuntu/_base/applications/kile/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kile/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/kile/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kile/debian/rules b/ubuntu/_base/applications/kile/debian/rules
index 005c629bf..005c629bf 100755
--- a/ubuntu/maverick/applications/kile/debian/rules
+++ b/ubuntu/_base/applications/kile/debian/rules
diff --git a/ubuntu/maverick/applications/kile/debian/source/format b/ubuntu/_base/applications/kile/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kile/debian/source/format
+++ b/ubuntu/_base/applications/kile/debian/source/format
diff --git a/ubuntu/maverick/applications/kile/debian/source/options b/ubuntu/_base/applications/kile/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kile/debian/source/options
+++ b/ubuntu/_base/applications/kile/debian/source/options
diff --git a/ubuntu/maverick/applications/kile/debian/watch b/ubuntu/_base/applications/kile/debian/watch
index e372a7062..e372a7062 100644
--- a/ubuntu/maverick/applications/kile/debian/watch
+++ b/ubuntu/_base/applications/kile/debian/watch
diff --git a/ubuntu/maverick/applications/kima/debian/changelog b/ubuntu/_base/applications/kima/debian/changelog
index 9cc006cef..9cc006cef 100644
--- a/ubuntu/maverick/applications/kima/debian/changelog
+++ b/ubuntu/_base/applications/kima/debian/changelog
diff --git a/ubuntu/maverick/applications/kima/debian/compat b/ubuntu/_base/applications/kima/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kima/debian/compat
+++ b/ubuntu/_base/applications/kima/debian/compat
diff --git a/ubuntu/maverick/applications/kima/debian/control b/ubuntu/_base/applications/kima/debian/control
index d28ad7ff6..d28ad7ff6 100644
--- a/ubuntu/maverick/applications/kima/debian/control
+++ b/ubuntu/_base/applications/kima/debian/control
diff --git a/ubuntu/maverick/applications/kima/debian/copyright b/ubuntu/_base/applications/kima/debian/copyright
index 8facbcf30..8facbcf30 100644
--- a/ubuntu/maverick/applications/kima/debian/copyright
+++ b/ubuntu/_base/applications/kima/debian/copyright
diff --git a/ubuntu/maverick/applications/kima/debian/rules b/ubuntu/_base/applications/kima/debian/rules
index dba0b0120..dba0b0120 100755
--- a/ubuntu/maverick/applications/kima/debian/rules
+++ b/ubuntu/_base/applications/kima/debian/rules
diff --git a/ubuntu/maverick/applications/kima/debian/source/format b/ubuntu/_base/applications/kima/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kima/debian/source/format
+++ b/ubuntu/_base/applications/kima/debian/source/format
diff --git a/ubuntu/maverick/applications/kima/debian/source/options b/ubuntu/_base/applications/kima/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kima/debian/source/options
+++ b/ubuntu/_base/applications/kima/debian/source/options
diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk b/ubuntu/_base/applications/kiosktool/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kiosktool/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl b/ubuntu/_base/applications/kiosktool/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kiosktool/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kiosktool/debian/changelog b/ubuntu/_base/applications/kiosktool/debian/changelog
index 550c04bb0..550c04bb0 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/changelog
+++ b/ubuntu/_base/applications/kiosktool/debian/changelog
diff --git a/ubuntu/maverick/applications/kiosktool/debian/compat b/ubuntu/_base/applications/kiosktool/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/compat
+++ b/ubuntu/_base/applications/kiosktool/debian/compat
diff --git a/ubuntu/maverick/applications/kiosktool/debian/control b/ubuntu/_base/applications/kiosktool/debian/control
index 1f7d50230..1f7d50230 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/control
+++ b/ubuntu/_base/applications/kiosktool/debian/control
diff --git a/ubuntu/maverick/applications/kiosktool/debian/copyright b/ubuntu/_base/applications/kiosktool/debian/copyright
index a88b1d8d2..a88b1d8d2 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/copyright
+++ b/ubuntu/_base/applications/kiosktool/debian/copyright
diff --git a/ubuntu/maverick/applications/kiosktool/debian/docs b/ubuntu/_base/applications/kiosktool/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/docs
+++ b/ubuntu/_base/applications/kiosktool/debian/docs
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
index 1ee900501..1ee900501 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
+++ b/ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/series b/ubuntu/_base/applications/kiosktool/debian/patches/series
index f6cd6dac1..f6cd6dac1 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/series
+++ b/ubuntu/_base/applications/kiosktool/debian/patches/series
diff --git a/ubuntu/maverick/applications/kiosktool/debian/rules b/ubuntu/_base/applications/kiosktool/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kiosktool/debian/rules
+++ b/ubuntu/_base/applications/kiosktool/debian/rules
diff --git a/ubuntu/maverick/applications/kiosktool/debian/source/format b/ubuntu/_base/applications/kiosktool/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/source/format
+++ b/ubuntu/_base/applications/kiosktool/debian/source/format
diff --git a/ubuntu/maverick/applications/kiosktool/debian/source/options b/ubuntu/_base/applications/kiosktool/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/source/options
+++ b/ubuntu/_base/applications/kiosktool/debian/source/options
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk b/ubuntu/_base/applications/kkbswitch/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kkbswitch/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/versions.pl b/ubuntu/_base/applications/kkbswitch/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kkbswitch/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/changelog b/ubuntu/_base/applications/kkbswitch/debian/changelog
index 6317d0066..6317d0066 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/changelog
+++ b/ubuntu/_base/applications/kkbswitch/debian/changelog
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/compat b/ubuntu/_base/applications/kkbswitch/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/compat
+++ b/ubuntu/_base/applications/kkbswitch/debian/compat
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/control b/ubuntu/_base/applications/kkbswitch/debian/control
index 3327f4eb7..3327f4eb7 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/control
+++ b/ubuntu/_base/applications/kkbswitch/debian/control
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/copyright b/ubuntu/_base/applications/kkbswitch/debian/copyright
index 69cc5c934..69cc5c934 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/copyright
+++ b/ubuntu/_base/applications/kkbswitch/debian/copyright
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.dirs b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.dirs
index 8a625f92e..8a625f92e 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.dirs
+++ b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.dirs
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.docs b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.docs
index c17f03764..c17f03764 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.docs
+++ b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.docs
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.install b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
index b9b4bccd3..b9b4bccd3 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.install
+++ b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.menu b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.menu
index e8422ae40..e8422ae40 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/kkbswitch-trinity.menu
+++ b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.menu
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/rules b/ubuntu/_base/applications/kkbswitch/debian/rules
index 959036064..959036064 100755
--- a/ubuntu/maverick/applications/kkbswitch/debian/rules
+++ b/ubuntu/_base/applications/kkbswitch/debian/rules
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/source/format b/ubuntu/_base/applications/kkbswitch/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/source/format
+++ b/ubuntu/_base/applications/kkbswitch/debian/source/format
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/source/options b/ubuntu/_base/applications/kkbswitch/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/source/options
+++ b/ubuntu/_base/applications/kkbswitch/debian/source/options
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs b/ubuntu/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs
index 590af08e4..590af08e4 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs
+++ b/ubuntu/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.dirs
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.install b/ubuntu/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.install
index 53bc85b55..53bc85b55 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/xkb-data-extra-trinity.install
+++ b/ubuntu/_base/applications/kkbswitch/debian/xkb-data-extra-trinity.install
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/kde.mk b/ubuntu/_base/applications/klcddimmer/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/klcddimmer/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/versions.pl b/ubuntu/_base/applications/klcddimmer/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/klcddimmer/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/changelog b/ubuntu/_base/applications/klcddimmer/debian/changelog
index c7731210d..c7731210d 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/changelog
+++ b/ubuntu/_base/applications/klcddimmer/debian/changelog
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/compat b/ubuntu/_base/applications/klcddimmer/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/compat
+++ b/ubuntu/_base/applications/klcddimmer/debian/compat
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/control b/ubuntu/_base/applications/klcddimmer/debian/control
index 66f749b78..66f749b78 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/control
+++ b/ubuntu/_base/applications/klcddimmer/debian/control
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/copyright b/ubuntu/_base/applications/klcddimmer/debian/copyright
index e8fb907ba..e8fb907ba 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/copyright
+++ b/ubuntu/_base/applications/klcddimmer/debian/copyright
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/docs b/ubuntu/_base/applications/klcddimmer/debian/docs
index c17f03764..c17f03764 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/docs
+++ b/ubuntu/_base/applications/klcddimmer/debian/docs
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/rules b/ubuntu/_base/applications/klcddimmer/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/klcddimmer/debian/rules
+++ b/ubuntu/_base/applications/klcddimmer/debian/rules
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/source/format b/ubuntu/_base/applications/klcddimmer/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/source/format
+++ b/ubuntu/_base/applications/klcddimmer/debian/source/format
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/source/options b/ubuntu/_base/applications/klcddimmer/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/source/options
+++ b/ubuntu/_base/applications/klcddimmer/debian/source/options
diff --git a/ubuntu/maverick/applications/kmatplot/debian/changelog b/ubuntu/_base/applications/kmatplot/debian/changelog
index 6bd58f944..6bd58f944 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/changelog
+++ b/ubuntu/_base/applications/kmatplot/debian/changelog
diff --git a/ubuntu/maverick/applications/kmatplot/debian/compat b/ubuntu/_base/applications/kmatplot/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/compat
+++ b/ubuntu/_base/applications/kmatplot/debian/compat
diff --git a/ubuntu/maverick/applications/kmatplot/debian/control b/ubuntu/_base/applications/kmatplot/debian/control
index fe9f817eb..fe9f817eb 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/control
+++ b/ubuntu/_base/applications/kmatplot/debian/control
diff --git a/ubuntu/maverick/applications/kmatplot/debian/copyright b/ubuntu/_base/applications/kmatplot/debian/copyright
index e61cc889c..e61cc889c 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/copyright
+++ b/ubuntu/_base/applications/kmatplot/debian/copyright
diff --git a/ubuntu/maverick/applications/kmatplot/debian/debianrules b/ubuntu/_base/applications/kmatplot/debian/debianrules
index 5976c6894..5976c6894 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/debianrules
+++ b/ubuntu/_base/applications/kmatplot/debian/debianrules
diff --git a/ubuntu/maverick/applications/kmatplot/debian/dirs b/ubuntu/_base/applications/kmatplot/debian/dirs
index e77248175..e77248175 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/dirs
+++ b/ubuntu/_base/applications/kmatplot/debian/dirs
diff --git a/ubuntu/maverick/applications/kmatplot/debian/kmatplot.1 b/ubuntu/_base/applications/kmatplot/debian/kmatplot.1
index 0937e379f..0937e379f 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/kmatplot.1
+++ b/ubuntu/_base/applications/kmatplot/debian/kmatplot.1
diff --git a/ubuntu/maverick/applications/kmatplot/debian/kmatplot.manpages b/ubuntu/_base/applications/kmatplot/debian/kmatplot.manpages
index e093ba20c..e093ba20c 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/kmatplot.manpages
+++ b/ubuntu/_base/applications/kmatplot/debian/kmatplot.manpages
diff --git a/ubuntu/maverick/applications/kmatplot/debian/menu b/ubuntu/_base/applications/kmatplot/debian/menu
index 0f04a74cf..0f04a74cf 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/menu
+++ b/ubuntu/_base/applications/kmatplot/debian/menu
diff --git a/ubuntu/maverick/applications/kmatplot/debian/rules b/ubuntu/_base/applications/kmatplot/debian/rules
index 0df925fe4..0df925fe4 100755
--- a/ubuntu/maverick/applications/kmatplot/debian/rules
+++ b/ubuntu/_base/applications/kmatplot/debian/rules
diff --git a/ubuntu/maverick/applications/kmatplot/debian/source/format b/ubuntu/_base/applications/kmatplot/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/source/format
+++ b/ubuntu/_base/applications/kmatplot/debian/source/format
diff --git a/ubuntu/maverick/applications/kmatplot/debian/source/options b/ubuntu/_base/applications/kmatplot/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/source/options
+++ b/ubuntu/_base/applications/kmatplot/debian/source/options
diff --git a/ubuntu/maverick/applications/kmplayer/debian/README.Debian b/ubuntu/_base/applications/kmplayer/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/README.Debian
+++ b/ubuntu/_base/applications/kmplayer/debian/README.Debian
diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk b/ubuntu/_base/applications/kmplayer/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kmplayer/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/versions.pl b/ubuntu/_base/applications/kmplayer/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kmplayer/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kmplayer/debian/changelog b/ubuntu/_base/applications/kmplayer/debian/changelog
index 94fbc450d..94fbc450d 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/changelog
+++ b/ubuntu/_base/applications/kmplayer/debian/changelog
diff --git a/ubuntu/maverick/applications/kmplayer/debian/compat b/ubuntu/_base/applications/kmplayer/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/compat
+++ b/ubuntu/_base/applications/kmplayer/debian/compat
diff --git a/ubuntu/maverick/applications/kmplayer/debian/control b/ubuntu/_base/applications/kmplayer/debian/control
index 421b3d6b3..421b3d6b3 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/control
+++ b/ubuntu/_base/applications/kmplayer/debian/control
diff --git a/ubuntu/maverick/applications/kmplayer/debian/copyright b/ubuntu/_base/applications/kmplayer/debian/copyright
index 749b0db05..749b0db05 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/copyright
+++ b/ubuntu/_base/applications/kmplayer/debian/copyright
diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-base-trinity.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
index 7e7f44aec..7e7f44aec 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-base-trinity.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
index 4590b56f4..4590b56f4 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity-doc.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
index 9b26532f3..9b26532f3 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity-doc.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
index f27e64ad7..f27e64ad7 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer-trinity.install
diff --git a/ubuntu/maverick/applications/kmplayer/debian/kmplayer.1.docbook b/ubuntu/_base/applications/kmplayer/debian/kmplayer.1.docbook
index dabfff5f0..dabfff5f0 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/kmplayer.1.docbook
+++ b/ubuntu/_base/applications/kmplayer/debian/kmplayer.1.docbook
diff --git a/ubuntu/maverick/applications/kmplayer/debian/menu b/ubuntu/_base/applications/kmplayer/debian/menu
index 792ed1a5b..792ed1a5b 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/menu
+++ b/ubuntu/_base/applications/kmplayer/debian/menu
diff --git a/ubuntu/maverick/applications/kmplayer/debian/patches/series b/ubuntu/_base/applications/kmplayer/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/patches/series
+++ b/ubuntu/_base/applications/kmplayer/debian/patches/series
diff --git a/ubuntu/maverick/applications/kmplayer/debian/rules b/ubuntu/_base/applications/kmplayer/debian/rules
index e5bb714ad..e5bb714ad 100755
--- a/ubuntu/maverick/applications/kmplayer/debian/rules
+++ b/ubuntu/_base/applications/kmplayer/debian/rules
diff --git a/ubuntu/maverick/applications/kmplayer/debian/source/format b/ubuntu/_base/applications/kmplayer/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/source/format
+++ b/ubuntu/_base/applications/kmplayer/debian/source/format
diff --git a/ubuntu/maverick/applications/kmplayer/debian/source/options b/ubuntu/_base/applications/kmplayer/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/source/options
+++ b/ubuntu/_base/applications/kmplayer/debian/source/options
diff --git a/ubuntu/maverick/applications/kmplayer/debian/watch b/ubuntu/_base/applications/kmplayer/debian/watch
index d809e2ca1..d809e2ca1 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/watch
+++ b/ubuntu/_base/applications/kmplayer/debian/watch
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/kde.mk b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/versions.pl b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/changelog b/ubuntu/_base/applications/kmyfirewall/debian/changelog
index cfe55d3e4..cfe55d3e4 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/changelog
+++ b/ubuntu/_base/applications/kmyfirewall/debian/changelog
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/compat b/ubuntu/_base/applications/kmyfirewall/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/compat
+++ b/ubuntu/_base/applications/kmyfirewall/debian/compat
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/control b/ubuntu/_base/applications/kmyfirewall/debian/control
index be7037d7c..be7037d7c 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/control
+++ b/ubuntu/_base/applications/kmyfirewall/debian/control
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/copyright b/ubuntu/_base/applications/kmyfirewall/debian/copyright
index 8429d407e..8429d407e 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/copyright
+++ b/ubuntu/_base/applications/kmyfirewall/debian/copyright
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs b/ubuntu/_base/applications/kmyfirewall/debian/debiandirs
index 90247b9a0..90247b9a0 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs
+++ b/ubuntu/_base/applications/kmyfirewall/debian/debiandirs
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/dirs b/ubuntu/_base/applications/kmyfirewall/debian/dirs
index f0312285e..f0312285e 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/dirs
+++ b/ubuntu/_base/applications/kmyfirewall/debian/dirs
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/docs b/ubuntu/_base/applications/kmyfirewall/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/docs
+++ b/ubuntu/_base/applications/kmyfirewall/debian/docs
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/install b/ubuntu/_base/applications/kmyfirewall/debian/install
index 3a28b6931..3a28b6931 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/install
+++ b/ubuntu/_base/applications/kmyfirewall/debian/install
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/kmfinstallerplugin.desktop b/ubuntu/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
index 3a562e7c0..3a562e7c0 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
+++ b/ubuntu/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.1 b/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.1
index cff01643d..cff01643d 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.1
+++ b/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.1
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.desktop b/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.desktop
index 57f12ad9c..57f12ad9c 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.desktop
+++ b/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.desktop
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.xpm b/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.xpm
index 3d58b81ff..3d58b81ff 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.xpm
+++ b/ubuntu/_base/applications/kmyfirewall/debian/kmyfirewall.xpm
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/manpages b/ubuntu/_base/applications/kmyfirewall/debian/manpages
index fab755280..fab755280 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/manpages
+++ b/ubuntu/_base/applications/kmyfirewall/debian/manpages
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/menu b/ubuntu/_base/applications/kmyfirewall/debian/menu
index 7280ce1ad..7280ce1ad 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/menu
+++ b/ubuntu/_base/applications/kmyfirewall/debian/menu
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/rules b/ubuntu/_base/applications/kmyfirewall/debian/rules
index bae3f5cf7..bae3f5cf7 100755
--- a/ubuntu/maverick/applications/kmyfirewall/debian/rules
+++ b/ubuntu/_base/applications/kmyfirewall/debian/rules
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/source/format b/ubuntu/_base/applications/kmyfirewall/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/source/format
+++ b/ubuntu/_base/applications/kmyfirewall/debian/source/format
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/source/options b/ubuntu/_base/applications/kmyfirewall/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/source/options
+++ b/ubuntu/_base/applications/kmyfirewall/debian/source/options
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/watch b/ubuntu/_base/applications/kmyfirewall/debian/watch
index 42dfe005b..42dfe005b 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/watch
+++ b/ubuntu/_base/applications/kmyfirewall/debian/watch
diff --git a/ubuntu/maverick/applications/kmymoney/debian/NEWS b/ubuntu/_base/applications/kmymoney/debian/NEWS
index a10bb6f91..a10bb6f91 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/NEWS
+++ b/ubuntu/_base/applications/kmymoney/debian/NEWS
diff --git a/ubuntu/maverick/applications/kmymoney/debian/README.source b/ubuntu/_base/applications/kmymoney/debian/README.source
index 2a0f24655..2a0f24655 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/README.source
+++ b/ubuntu/_base/applications/kmymoney/debian/README.source
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk b/ubuntu/_base/applications/kmymoney/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kmymoney/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/versions.pl b/ubuntu/_base/applications/kmymoney/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kmymoney/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kmymoney/debian/changelog b/ubuntu/_base/applications/kmymoney/debian/changelog
index f38f9f7ed..f38f9f7ed 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/changelog
+++ b/ubuntu/_base/applications/kmymoney/debian/changelog
diff --git a/ubuntu/maverick/applications/kmymoney/debian/compat b/ubuntu/_base/applications/kmymoney/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/compat
+++ b/ubuntu/_base/applications/kmymoney/debian/compat
diff --git a/ubuntu/maverick/applications/kmymoney/debian/control b/ubuntu/_base/applications/kmymoney/debian/control
index a5b377041..a5b377041 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/control
+++ b/ubuntu/_base/applications/kmymoney/debian/control
diff --git a/ubuntu/maverick/applications/kmymoney/debian/copyright b/ubuntu/_base/applications/kmymoney/debian/copyright
index 6ba1a0edf..6ba1a0edf 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/copyright
+++ b/ubuntu/_base/applications/kmymoney/debian/copyright
diff --git a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-common-trinity.install b/ubuntu/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install
index f8c7e9a01..f8c7e9a01 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-common-trinity.install
+++ b/ubuntu/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install
diff --git a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install
index f8c5dc4e3..f8c5dc4e3 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install
diff --git a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity.docs b/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.docs
index cbc02b603..cbc02b603 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity.docs
+++ b/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.docs
diff --git a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity.install b/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.install
index 8489f7384..8489f7384 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity.install
+++ b/ubuntu/_base/applications/kmymoney/debian/kmymoney2-trinity.install
diff --git a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2.xpm b/ubuntu/_base/applications/kmymoney/debian/kmymoney2.xpm
index 8bf0321d5..8bf0321d5 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2.xpm
+++ b/ubuntu/_base/applications/kmymoney/debian/kmymoney2.xpm
diff --git a/ubuntu/maverick/applications/kmymoney/debian/menu b/ubuntu/_base/applications/kmymoney/debian/menu
index fe92fdaa3..fe92fdaa3 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/menu
+++ b/ubuntu/_base/applications/kmymoney/debian/menu
diff --git a/ubuntu/maverick/applications/kmymoney/debian/patches/series b/ubuntu/_base/applications/kmymoney/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/patches/series
+++ b/ubuntu/_base/applications/kmymoney/debian/patches/series
diff --git a/ubuntu/maverick/applications/kmymoney/debian/rules b/ubuntu/_base/applications/kmymoney/debian/rules
index 9f3b27c62..9f3b27c62 100755
--- a/ubuntu/maverick/applications/kmymoney/debian/rules
+++ b/ubuntu/_base/applications/kmymoney/debian/rules
diff --git a/ubuntu/maverick/applications/kmymoney/debian/source/format b/ubuntu/_base/applications/kmymoney/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/source/format
+++ b/ubuntu/_base/applications/kmymoney/debian/source/format
diff --git a/ubuntu/maverick/applications/kmymoney/debian/source/options b/ubuntu/_base/applications/kmymoney/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/source/options
+++ b/ubuntu/_base/applications/kmymoney/debian/source/options
diff --git a/ubuntu/maverick/applications/kmymoney/debian/watch b/ubuntu/_base/applications/kmymoney/debian/watch
index b80efc65c..b80efc65c 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/watch
+++ b/ubuntu/_base/applications/kmymoney/debian/watch
diff --git a/ubuntu/maverick/applications/knemo/debian/README.Debian b/ubuntu/_base/applications/knemo/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/applications/knemo/debian/README.Debian
+++ b/ubuntu/_base/applications/knemo/debian/README.Debian
diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/knemo/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/knemo/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk b/ubuntu/_base/applications/knemo/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/knemo/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/versions.pl b/ubuntu/_base/applications/knemo/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/knemo/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knemo/debian/changelog b/ubuntu/_base/applications/knemo/debian/changelog
index 93005e6cb..93005e6cb 100644
--- a/ubuntu/maverick/applications/knemo/debian/changelog
+++ b/ubuntu/_base/applications/knemo/debian/changelog
diff --git a/ubuntu/maverick/applications/knemo/debian/compat b/ubuntu/_base/applications/knemo/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knemo/debian/compat
+++ b/ubuntu/_base/applications/knemo/debian/compat
diff --git a/ubuntu/maverick/applications/knemo/debian/control b/ubuntu/_base/applications/knemo/debian/control
index cf1568c5d..cf1568c5d 100644
--- a/ubuntu/maverick/applications/knemo/debian/control
+++ b/ubuntu/_base/applications/knemo/debian/control
diff --git a/ubuntu/maverick/applications/knemo/debian/copyright b/ubuntu/_base/applications/knemo/debian/copyright
index 56f8c81f8..56f8c81f8 100644
--- a/ubuntu/maverick/applications/knemo/debian/copyright
+++ b/ubuntu/_base/applications/knemo/debian/copyright
diff --git a/ubuntu/maverick/applications/knemo/debian/dirs b/ubuntu/_base/applications/knemo/debian/dirs
index 110a71185..110a71185 100644
--- a/ubuntu/maverick/applications/knemo/debian/dirs
+++ b/ubuntu/_base/applications/knemo/debian/dirs
diff --git a/ubuntu/maverick/applications/knemo/debian/patches/series b/ubuntu/_base/applications/knemo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knemo/debian/patches/series
+++ b/ubuntu/_base/applications/knemo/debian/patches/series
diff --git a/ubuntu/maverick/applications/knemo/debian/rules b/ubuntu/_base/applications/knemo/debian/rules
index d620f6c1b..d620f6c1b 100755
--- a/ubuntu/maverick/applications/knemo/debian/rules
+++ b/ubuntu/_base/applications/knemo/debian/rules
diff --git a/ubuntu/maverick/applications/knemo/debian/source/format b/ubuntu/_base/applications/knemo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/knemo/debian/source/format
+++ b/ubuntu/_base/applications/knemo/debian/source/format
diff --git a/ubuntu/maverick/applications/knemo/debian/source/options b/ubuntu/_base/applications/knemo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knemo/debian/source/options
+++ b/ubuntu/_base/applications/knemo/debian/source/options
diff --git a/ubuntu/maverick/applications/knetload/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/knetload/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/knetload/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/knetload/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knetload/debian/cdbs/kde.mk b/ubuntu/_base/applications/knetload/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/knetload/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/knetload/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetload/debian/cdbs/versions.pl b/ubuntu/_base/applications/knetload/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/knetload/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/knetload/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knetload/debian/changelog b/ubuntu/_base/applications/knetload/debian/changelog
index ed97c1955..ed97c1955 100644
--- a/ubuntu/maverick/applications/knetload/debian/changelog
+++ b/ubuntu/_base/applications/knetload/debian/changelog
diff --git a/ubuntu/maverick/applications/knetload/debian/compat b/ubuntu/_base/applications/knetload/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knetload/debian/compat
+++ b/ubuntu/_base/applications/knetload/debian/compat
diff --git a/ubuntu/maverick/applications/knetload/debian/control b/ubuntu/_base/applications/knetload/debian/control
index 20ffdb6bc..20ffdb6bc 100644
--- a/ubuntu/maverick/applications/knetload/debian/control
+++ b/ubuntu/_base/applications/knetload/debian/control
diff --git a/ubuntu/maverick/applications/knetload/debian/copyright b/ubuntu/_base/applications/knetload/debian/copyright
index 7093501e6..7093501e6 100644
--- a/ubuntu/maverick/applications/knetload/debian/copyright
+++ b/ubuntu/_base/applications/knetload/debian/copyright
diff --git a/ubuntu/maverick/applications/knetload/debian/dirs b/ubuntu/_base/applications/knetload/debian/dirs
index f583045fe..f583045fe 100644
--- a/ubuntu/maverick/applications/knetload/debian/dirs
+++ b/ubuntu/_base/applications/knetload/debian/dirs
diff --git a/ubuntu/maverick/applications/knetload/debian/docs b/ubuntu/_base/applications/knetload/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/maverick/applications/knetload/debian/docs
+++ b/ubuntu/_base/applications/knetload/debian/docs
diff --git a/ubuntu/maverick/applications/knetload/debian/knetload-trinity.install b/ubuntu/_base/applications/knetload/debian/knetload-trinity.install
index cdb14888d..cdb14888d 100644
--- a/ubuntu/maverick/applications/knetload/debian/knetload-trinity.install
+++ b/ubuntu/_base/applications/knetload/debian/knetload-trinity.install
diff --git a/ubuntu/maverick/applications/knetload/debian/knetload.xpm b/ubuntu/_base/applications/knetload/debian/knetload.xpm
index 3cc7ef17f..3cc7ef17f 100644
--- a/ubuntu/maverick/applications/knetload/debian/knetload.xpm
+++ b/ubuntu/_base/applications/knetload/debian/knetload.xpm
diff --git a/ubuntu/maverick/applications/knetload/debian/menu b/ubuntu/_base/applications/knetload/debian/menu
index 0e0493879..0e0493879 100644
--- a/ubuntu/maverick/applications/knetload/debian/menu
+++ b/ubuntu/_base/applications/knetload/debian/menu
diff --git a/ubuntu/maverick/applications/knetload/debian/patches/series b/ubuntu/_base/applications/knetload/debian/patches/series
index 8b1378917..8b1378917 100644
--- a/ubuntu/maverick/applications/knetload/debian/patches/series
+++ b/ubuntu/_base/applications/knetload/debian/patches/series
diff --git a/ubuntu/maverick/applications/knetload/debian/rules b/ubuntu/_base/applications/knetload/debian/rules
index e039e1a72..e039e1a72 100755
--- a/ubuntu/maverick/applications/knetload/debian/rules
+++ b/ubuntu/_base/applications/knetload/debian/rules
diff --git a/ubuntu/maverick/applications/knetload/debian/source/format b/ubuntu/_base/applications/knetload/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/knetload/debian/source/format
+++ b/ubuntu/_base/applications/knetload/debian/source/format
diff --git a/ubuntu/maverick/applications/knetload/debian/source/options b/ubuntu/_base/applications/knetload/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knetload/debian/source/options
+++ b/ubuntu/_base/applications/knetload/debian/source/options
diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/knetstats/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk b/ubuntu/_base/applications/knetstats/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/knetstats/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/versions.pl b/ubuntu/_base/applications/knetstats/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/knetstats/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knetstats/debian/changelog b/ubuntu/_base/applications/knetstats/debian/changelog
index d1015cb26..d1015cb26 100644
--- a/ubuntu/maverick/applications/knetstats/debian/changelog
+++ b/ubuntu/_base/applications/knetstats/debian/changelog
diff --git a/ubuntu/maverick/applications/knetstats/debian/compat b/ubuntu/_base/applications/knetstats/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knetstats/debian/compat
+++ b/ubuntu/_base/applications/knetstats/debian/compat
diff --git a/ubuntu/maverick/applications/knetstats/debian/control b/ubuntu/_base/applications/knetstats/debian/control
index e4465d5e4..e4465d5e4 100644
--- a/ubuntu/maverick/applications/knetstats/debian/control
+++ b/ubuntu/_base/applications/knetstats/debian/control
diff --git a/ubuntu/maverick/applications/knetstats/debian/copyright b/ubuntu/_base/applications/knetstats/debian/copyright
index bf7dbe0ed..bf7dbe0ed 100644
--- a/ubuntu/maverick/applications/knetstats/debian/copyright
+++ b/ubuntu/_base/applications/knetstats/debian/copyright
diff --git a/ubuntu/maverick/applications/knetstats/debian/docs b/ubuntu/_base/applications/knetstats/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/knetstats/debian/docs
+++ b/ubuntu/_base/applications/knetstats/debian/docs
diff --git a/ubuntu/maverick/applications/knetstats/debian/patches/series b/ubuntu/_base/applications/knetstats/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knetstats/debian/patches/series
+++ b/ubuntu/_base/applications/knetstats/debian/patches/series
diff --git a/ubuntu/maverick/applications/knetstats/debian/rules b/ubuntu/_base/applications/knetstats/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/knetstats/debian/rules
+++ b/ubuntu/_base/applications/knetstats/debian/rules
diff --git a/ubuntu/maverick/applications/knetstats/debian/source/format b/ubuntu/_base/applications/knetstats/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/knetstats/debian/source/format
+++ b/ubuntu/_base/applications/knetstats/debian/source/format
diff --git a/ubuntu/maverick/applications/knetstats/debian/source/options b/ubuntu/_base/applications/knetstats/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knetstats/debian/source/options
+++ b/ubuntu/_base/applications/knetstats/debian/source/options
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/README.source b/ubuntu/_base/applications/knetworkmanager8/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/README.source
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/README.source
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/changelog b/ubuntu/_base/applications/knetworkmanager8/debian/changelog
index 58dd721cb..58dd721cb 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/changelog
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/changelog
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/compat b/ubuntu/_base/applications/knetworkmanager8/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/compat
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/compat
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/control b/ubuntu/_base/applications/knetworkmanager8/debian/control
index c2197e398..c2197e398 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/control
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/control
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/copyright b/ubuntu/_base/applications/knetworkmanager8/debian/copyright
index 2490de254..2490de254 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/copyright
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/copyright
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1 b/ubuntu/_base/applications/knetworkmanager8/debian/knetworkmanager.1
index e4f5073db..e4f5073db 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/knetworkmanager.1
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/knetworkmanager.1
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/manpages b/ubuntu/_base/applications/knetworkmanager8/debian/manpages
index e2859341f..e2859341f 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/manpages
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/manpages
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/menu b/ubuntu/_base/applications/knetworkmanager8/debian/menu
index cc47df4d0..cc47df4d0 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/menu
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/menu
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index b5316fc73..b5316fc73 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
index fdd4e51ca..fdd4e51ca 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/patches/series b/ubuntu/_base/applications/knetworkmanager8/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/patches/series
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/patches/series
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/rules b/ubuntu/_base/applications/knetworkmanager8/debian/rules
index 56aef725f..56aef725f 100755
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/rules
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/rules
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/source/format b/ubuntu/_base/applications/knetworkmanager8/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/source/format
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/source/format
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/source/options b/ubuntu/_base/applications/knetworkmanager8/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/source/options
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/source/options
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/watch b/ubuntu/_base/applications/knetworkmanager8/debian/watch
index ad7a7be91..ad7a7be91 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/watch
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/watch
diff --git a/ubuntu/maverick/applications/knights/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/knights/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/knights/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/knights/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knights/debian/cdbs/kde.mk b/ubuntu/_base/applications/knights/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/knights/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/knights/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knights/debian/cdbs/versions.pl b/ubuntu/_base/applications/knights/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/knights/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/knights/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knights/debian/changelog b/ubuntu/_base/applications/knights/debian/changelog
index 9fdc0f108..9fdc0f108 100644
--- a/ubuntu/maverick/applications/knights/debian/changelog
+++ b/ubuntu/_base/applications/knights/debian/changelog
diff --git a/ubuntu/maverick/applications/knights/debian/compat b/ubuntu/_base/applications/knights/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knights/debian/compat
+++ b/ubuntu/_base/applications/knights/debian/compat
diff --git a/ubuntu/maverick/applications/knights/debian/control b/ubuntu/_base/applications/knights/debian/control
index fa1d161a6..fa1d161a6 100644
--- a/ubuntu/maverick/applications/knights/debian/control
+++ b/ubuntu/_base/applications/knights/debian/control
diff --git a/ubuntu/maverick/applications/knights/debian/copyright b/ubuntu/_base/applications/knights/debian/copyright
index c8554f7b5..c8554f7b5 100644
--- a/ubuntu/maverick/applications/knights/debian/copyright
+++ b/ubuntu/_base/applications/knights/debian/copyright
diff --git a/ubuntu/maverick/applications/knights/debian/docs b/ubuntu/_base/applications/knights/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/knights/debian/docs
+++ b/ubuntu/_base/applications/knights/debian/docs
diff --git a/ubuntu/maverick/applications/knights/debian/install b/ubuntu/_base/applications/knights/debian/install
index 013fe66c3..013fe66c3 100644
--- a/ubuntu/maverick/applications/knights/debian/install
+++ b/ubuntu/_base/applications/knights/debian/install
diff --git a/ubuntu/maverick/applications/knights/debian/knights.xpm b/ubuntu/_base/applications/knights/debian/knights.xpm
index afbf1959a..afbf1959a 100644
--- a/ubuntu/maverick/applications/knights/debian/knights.xpm
+++ b/ubuntu/_base/applications/knights/debian/knights.xpm
diff --git a/ubuntu/maverick/applications/knights/debian/menu b/ubuntu/_base/applications/knights/debian/menu
index 8ebc94bc8..8ebc94bc8 100644
--- a/ubuntu/maverick/applications/knights/debian/menu
+++ b/ubuntu/_base/applications/knights/debian/menu
diff --git a/ubuntu/maverick/applications/knights/debian/patches/.gitignore b/ubuntu/_base/applications/knights/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knights/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/knights/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/knights/debian/rules b/ubuntu/_base/applications/knights/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/knights/debian/rules
+++ b/ubuntu/_base/applications/knights/debian/rules
diff --git a/ubuntu/maverick/applications/knights/debian/source/format b/ubuntu/_base/applications/knights/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/knights/debian/source/format
+++ b/ubuntu/_base/applications/knights/debian/source/format
diff --git a/ubuntu/maverick/applications/knights/debian/source/options b/ubuntu/_base/applications/knights/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knights/debian/source/options
+++ b/ubuntu/_base/applications/knights/debian/source/options
diff --git a/ubuntu/maverick/applications/knmap/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/knmap/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/knmap/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/knmap/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knmap/debian/cdbs/kde.mk b/ubuntu/_base/applications/knmap/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/knmap/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/knmap/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knmap/debian/cdbs/versions.pl b/ubuntu/_base/applications/knmap/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/knmap/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/knmap/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knmap/debian/changelog b/ubuntu/_base/applications/knmap/debian/changelog
index 75423888b..75423888b 100644
--- a/ubuntu/maverick/applications/knmap/debian/changelog
+++ b/ubuntu/_base/applications/knmap/debian/changelog
diff --git a/ubuntu/maverick/applications/knmap/debian/compat b/ubuntu/_base/applications/knmap/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knmap/debian/compat
+++ b/ubuntu/_base/applications/knmap/debian/compat
diff --git a/ubuntu/maverick/applications/knmap/debian/control b/ubuntu/_base/applications/knmap/debian/control
index 5471655b2..5471655b2 100644
--- a/ubuntu/maverick/applications/knmap/debian/control
+++ b/ubuntu/_base/applications/knmap/debian/control
diff --git a/ubuntu/maverick/applications/knmap/debian/copyright b/ubuntu/_base/applications/knmap/debian/copyright
index 3ea86584c..3ea86584c 100644
--- a/ubuntu/maverick/applications/knmap/debian/copyright
+++ b/ubuntu/_base/applications/knmap/debian/copyright
diff --git a/ubuntu/maverick/applications/knmap/debian/docs b/ubuntu/_base/applications/knmap/debian/docs
index 6f12db508..6f12db508 100644
--- a/ubuntu/maverick/applications/knmap/debian/docs
+++ b/ubuntu/_base/applications/knmap/debian/docs
diff --git a/ubuntu/maverick/applications/knmap/debian/patches/series b/ubuntu/_base/applications/knmap/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knmap/debian/patches/series
+++ b/ubuntu/_base/applications/knmap/debian/patches/series
diff --git a/ubuntu/maverick/applications/knmap/debian/rules b/ubuntu/_base/applications/knmap/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/knmap/debian/rules
+++ b/ubuntu/_base/applications/knmap/debian/rules
diff --git a/ubuntu/maverick/applications/knmap/debian/source/format b/ubuntu/_base/applications/knmap/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/knmap/debian/source/format
+++ b/ubuntu/_base/applications/knmap/debian/source/format
diff --git a/ubuntu/maverick/applications/knmap/debian/source/options b/ubuntu/_base/applications/knmap/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knmap/debian/source/options
+++ b/ubuntu/_base/applications/knmap/debian/source/options
diff --git a/ubuntu/maverick/applications/knowit/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/knowit/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/knowit/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/knowit/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knowit/debian/cdbs/kde.mk b/ubuntu/_base/applications/knowit/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/knowit/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/knowit/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knowit/debian/cdbs/versions.pl b/ubuntu/_base/applications/knowit/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/knowit/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/knowit/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knowit/debian/changelog b/ubuntu/_base/applications/knowit/debian/changelog
index b5d67442f..b5d67442f 100644
--- a/ubuntu/maverick/applications/knowit/debian/changelog
+++ b/ubuntu/_base/applications/knowit/debian/changelog
diff --git a/ubuntu/maverick/applications/knowit/debian/compat b/ubuntu/_base/applications/knowit/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knowit/debian/compat
+++ b/ubuntu/_base/applications/knowit/debian/compat
diff --git a/ubuntu/maverick/applications/knowit/debian/control b/ubuntu/_base/applications/knowit/debian/control
index 50eea23b0..50eea23b0 100644
--- a/ubuntu/maverick/applications/knowit/debian/control
+++ b/ubuntu/_base/applications/knowit/debian/control
diff --git a/ubuntu/maverick/applications/knowit/debian/copyright b/ubuntu/_base/applications/knowit/debian/copyright
index 008edff30..008edff30 100644
--- a/ubuntu/maverick/applications/knowit/debian/copyright
+++ b/ubuntu/_base/applications/knowit/debian/copyright
diff --git a/ubuntu/maverick/applications/knowit/debian/docs b/ubuntu/_base/applications/knowit/debian/docs
index 5502ed8f4..5502ed8f4 100644
--- a/ubuntu/maverick/applications/knowit/debian/docs
+++ b/ubuntu/_base/applications/knowit/debian/docs
diff --git a/ubuntu/maverick/applications/knowit/debian/rules b/ubuntu/_base/applications/knowit/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/knowit/debian/rules
+++ b/ubuntu/_base/applications/knowit/debian/rules
diff --git a/ubuntu/maverick/applications/knowit/debian/source/format b/ubuntu/_base/applications/knowit/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/knowit/debian/source/format
+++ b/ubuntu/_base/applications/knowit/debian/source/format
diff --git a/ubuntu/maverick/applications/knowit/debian/source/options b/ubuntu/_base/applications/knowit/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knowit/debian/source/options
+++ b/ubuntu/_base/applications/knowit/debian/source/options
diff --git a/ubuntu/maverick/applications/knutclient/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/knutclient/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/knutclient/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/knutclient/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knutclient/debian/cdbs/kde.mk b/ubuntu/_base/applications/knutclient/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/knutclient/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/knutclient/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knutclient/debian/cdbs/versions.pl b/ubuntu/_base/applications/knutclient/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/knutclient/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/knutclient/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knutclient/debian/changelog b/ubuntu/_base/applications/knutclient/debian/changelog
index e63f05435..e63f05435 100644
--- a/ubuntu/maverick/applications/knutclient/debian/changelog
+++ b/ubuntu/_base/applications/knutclient/debian/changelog
diff --git a/ubuntu/maverick/applications/knutclient/debian/compat b/ubuntu/_base/applications/knutclient/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knutclient/debian/compat
+++ b/ubuntu/_base/applications/knutclient/debian/compat
diff --git a/ubuntu/maverick/applications/knutclient/debian/control b/ubuntu/_base/applications/knutclient/debian/control
index ef56fefa7..ef56fefa7 100644
--- a/ubuntu/maverick/applications/knutclient/debian/control
+++ b/ubuntu/_base/applications/knutclient/debian/control
diff --git a/ubuntu/maverick/applications/knutclient/debian/copyright b/ubuntu/_base/applications/knutclient/debian/copyright
index 2d9b4b658..2d9b4b658 100644
--- a/ubuntu/maverick/applications/knutclient/debian/copyright
+++ b/ubuntu/_base/applications/knutclient/debian/copyright
diff --git a/ubuntu/maverick/applications/knutclient/debian/docs b/ubuntu/_base/applications/knutclient/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/knutclient/debian/docs
+++ b/ubuntu/_base/applications/knutclient/debian/docs
diff --git a/ubuntu/maverick/applications/knutclient/debian/knutclient.menu b/ubuntu/_base/applications/knutclient/debian/knutclient.menu
index c6844afcc..c6844afcc 100644
--- a/ubuntu/maverick/applications/knutclient/debian/knutclient.menu
+++ b/ubuntu/_base/applications/knutclient/debian/knutclient.menu
diff --git a/ubuntu/maverick/applications/knutclient/debian/preinst b/ubuntu/_base/applications/knutclient/debian/preinst
index 17d2ead82..17d2ead82 100644
--- a/ubuntu/maverick/applications/knutclient/debian/preinst
+++ b/ubuntu/_base/applications/knutclient/debian/preinst
diff --git a/ubuntu/maverick/applications/knutclient/debian/rules b/ubuntu/_base/applications/knutclient/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/knutclient/debian/rules
+++ b/ubuntu/_base/applications/knutclient/debian/rules
diff --git a/ubuntu/maverick/applications/knutclient/debian/source/format b/ubuntu/_base/applications/knutclient/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/knutclient/debian/source/format
+++ b/ubuntu/_base/applications/knutclient/debian/source/format
diff --git a/ubuntu/maverick/applications/knutclient/debian/source/options b/ubuntu/_base/applications/knutclient/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knutclient/debian/source/options
+++ b/ubuntu/_base/applications/knutclient/debian/source/options
diff --git a/ubuntu/maverick/applications/knutclient/debian/watch b/ubuntu/_base/applications/knutclient/debian/watch
index 231bd3e50..231bd3e50 100644
--- a/ubuntu/maverick/applications/knutclient/debian/watch
+++ b/ubuntu/_base/applications/knutclient/debian/watch
diff --git a/ubuntu/maverick/applications/koffice-i18n/debian/changelog b/ubuntu/_base/applications/koffice-i18n/debian/changelog
index 26f667147..26f667147 100644
--- a/ubuntu/maverick/applications/koffice-i18n/debian/changelog
+++ b/ubuntu/_base/applications/koffice-i18n/debian/changelog
diff --git a/ubuntu/maverick/applications/koffice-i18n/debian/compat b/ubuntu/_base/applications/koffice-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/koffice-i18n/debian/compat
+++ b/ubuntu/_base/applications/koffice-i18n/debian/compat
diff --git a/ubuntu/maverick/applications/koffice-i18n/debian/control b/ubuntu/_base/applications/koffice-i18n/debian/control
index 8684f2ccc..8684f2ccc 100644
--- a/ubuntu/maverick/applications/koffice-i18n/debian/control
+++ b/ubuntu/_base/applications/koffice-i18n/debian/control
diff --git a/ubuntu/maverick/applications/koffice-i18n/debian/copyright b/ubuntu/_base/applications/koffice-i18n/debian/copyright
index 2ab72642a..2ab72642a 100644
--- a/ubuntu/maverick/applications/koffice-i18n/debian/copyright
+++ b/ubuntu/_base/applications/koffice-i18n/debian/copyright
diff --git a/ubuntu/maverick/applications/koffice-i18n/debian/debiandirs b/ubuntu/_base/applications/koffice-i18n/debian/debiandirs
index 90247b9a0..90247b9a0 100644
--- a/ubuntu/maverick/applications/koffice-i18n/debian/debiandirs
+++ b/ubuntu/_base/applications/koffice-i18n/debian/debiandirs
diff --git a/ubuntu/maverick/applications/koffice-i18n/debian/rules b/ubuntu/_base/applications/koffice-i18n/debian/rules
index 00a275f9e..00a275f9e 100755
--- a/ubuntu/maverick/applications/koffice-i18n/debian/rules
+++ b/ubuntu/_base/applications/koffice-i18n/debian/rules
diff --git a/ubuntu/maverick/applications/koffice-i18n/debian/source/format b/ubuntu/_base/applications/koffice-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/koffice-i18n/debian/source/format
+++ b/ubuntu/_base/applications/koffice-i18n/debian/source/format
diff --git a/ubuntu/maverick/applications/koffice-i18n/debian/source/options b/ubuntu/_base/applications/koffice-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/koffice-i18n/debian/source/options
+++ b/ubuntu/_base/applications/koffice-i18n/debian/source/options
diff --git a/ubuntu/maverick/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ec579c644..ec579c644 100644
--- a/ubuntu/maverick/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/applications/koffice/debian/README.MimeType b/ubuntu/_base/applications/koffice/debian/README.MimeType
index 47949d713..47949d713 100644
--- a/ubuntu/maverick/applications/koffice/debian/README.MimeType
+++ b/ubuntu/_base/applications/koffice/debian/README.MimeType
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/koffice/debian/cdbs/debian-qt-kde.mk
index eb7666b8e..eb7666b8e 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/koffice/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk b/ubuntu/_base/applications/koffice/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/koffice/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/versions.pl b/ubuntu/_base/applications/koffice/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/koffice/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.install
index 7bed60e6c..7bed60e6c 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.lintian b/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.lintian
index 7500cb18d..7500cb18d 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/chalk-data-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.docs b/ubuntu/_base/applications/koffice/debian/chalk-trinity.docs
index 99cd93d41..99cd93d41 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/chalk-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install b/ubuntu/_base/applications/koffice/debian/chalk-trinity.install
index 4df24b77e..4df24b77e 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/chalk-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/_base/applications/koffice/debian/chalk-trinity.lintian
index 1d75d150d..1d75d150d 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/chalk-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.menu b/ubuntu/_base/applications/koffice/debian/chalk-trinity.menu
index fae9524e7..fae9524e7 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/chalk-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.mime b/ubuntu/_base/applications/koffice/debian/chalk-trinity.mime
index 86a95ce5b..86a95ce5b 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.mime
+++ b/ubuntu/_base/applications/koffice/debian/chalk-trinity.mime
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk.xpm b/ubuntu/_base/applications/koffice/debian/chalk.xpm
index 0edc4f49a..0edc4f49a 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk.xpm
+++ b/ubuntu/_base/applications/koffice/debian/chalk.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/changelog b/ubuntu/_base/applications/koffice/debian/changelog
index 8cbb6f1dc..8cbb6f1dc 100644
--- a/ubuntu/maverick/applications/koffice/debian/changelog
+++ b/ubuntu/_base/applications/koffice/debian/changelog
diff --git a/ubuntu/maverick/applications/koffice/debian/compat b/ubuntu/_base/applications/koffice/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/koffice/debian/compat
+++ b/ubuntu/_base/applications/koffice/debian/compat
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/_base/applications/koffice/debian/control
index 92e68c718..92e68c718 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/_base/applications/koffice/debian/control
diff --git a/ubuntu/maverick/applications/koffice/debian/copyright b/ubuntu/_base/applications/koffice/debian/copyright
index 900ced776..900ced776 100644
--- a/ubuntu/maverick/applications/koffice/debian/copyright
+++ b/ubuntu/_base/applications/koffice/debian/copyright
diff --git a/ubuntu/maverick/applications/koffice/debian/fogra27l.icm.uu b/ubuntu/_base/applications/koffice/debian/fogra27l.icm.uu
index 39417fc89..39417fc89 100644
--- a/ubuntu/maverick/applications/koffice/debian/fogra27l.icm.uu
+++ b/ubuntu/_base/applications/koffice/debian/fogra27l.icm.uu
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.docs b/ubuntu/_base/applications/koffice/debian/karbon-trinity.docs
index 975685c5b..975685c5b 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/karbon-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install b/ubuntu/_base/applications/koffice/debian/karbon-trinity.install
index a03e53a02..a03e53a02 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/karbon-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian b/ubuntu/_base/applications/koffice/debian/karbon-trinity.lintian
index b08ff3b43..b08ff3b43 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/karbon-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.manpages b/ubuntu/_base/applications/koffice/debian/karbon-trinity.manpages
index 8a212a2b2..8a212a2b2 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/karbon-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.menu b/ubuntu/_base/applications/koffice/debian/karbon-trinity.menu
index e04f3c6c6..e04f3c6c6 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/karbon-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.mime b/ubuntu/_base/applications/koffice/debian/karbon-trinity.mime
index 30e0e75b0..30e0e75b0 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.mime
+++ b/ubuntu/_base/applications/koffice/debian/karbon-trinity.mime
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon.1 b/ubuntu/_base/applications/koffice/debian/karbon.1
index 6a4cbb8ef..6a4cbb8ef 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon.1
+++ b/ubuntu/_base/applications/koffice/debian/karbon.1
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon.xpm b/ubuntu/_base/applications/koffice/debian/karbon.xpm
index 92f24765d..92f24765d 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon.xpm
+++ b/ubuntu/_base/applications/koffice/debian/karbon.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/kchart-trinity.README.Debian
index 5caeb12aa..5caeb12aa 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/kchart-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.docs b/ubuntu/_base/applications/koffice/debian/kchart-trinity.docs
index d79e8fa24..d79e8fa24 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/kchart-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install b/ubuntu/_base/applications/koffice/debian/kchart-trinity.install
index c5d3596c2..c5d3596c2 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kchart-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kchart-trinity.lintian
index b548f2d00..b548f2d00 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kchart-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.manpages b/ubuntu/_base/applications/koffice/debian/kchart-trinity.manpages
index 38c864763..38c864763 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/kchart-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.menu b/ubuntu/_base/applications/koffice/debian/kchart-trinity.menu
index 26e7aebf0..26e7aebf0 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/kchart-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.mime b/ubuntu/_base/applications/koffice/debian/kchart-trinity.mime
index 7b0f739ff..7b0f739ff 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.mime
+++ b/ubuntu/_base/applications/koffice/debian/kchart-trinity.mime
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart.1 b/ubuntu/_base/applications/koffice/debian/kchart.1
index 367f2e7ab..367f2e7ab 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart.1
+++ b/ubuntu/_base/applications/koffice/debian/kchart.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart.xpm b/ubuntu/_base/applications/koffice/debian/kchart.xpm
index 4b1c6e11d..4b1c6e11d 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart.xpm
+++ b/ubuntu/_base/applications/koffice/debian/kchart.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.docs b/ubuntu/_base/applications/koffice/debian/kexi-trinity.docs
index 2633ffdfd..2633ffdfd 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/kexi-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install b/ubuntu/_base/applications/koffice/debian/kexi-trinity.install
index cce63ab24..cce63ab24 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kexi-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kexi-trinity.lintian
index c89fb0678..c89fb0678 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kexi-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/kformula-trinity.README.Debian
index fd4cb53d6..fd4cb53d6 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/kformula-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.docs b/ubuntu/_base/applications/koffice/debian/kformula-trinity.docs
index a5ddd1f27..a5ddd1f27 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/kformula-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install b/ubuntu/_base/applications/koffice/debian/kformula-trinity.install
index c97a73fa5..c97a73fa5 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kformula-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kformula-trinity.lintian
index 25a8c006f..25a8c006f 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kformula-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.manpages b/ubuntu/_base/applications/koffice/debian/kformula-trinity.manpages
index 35c78eaa9..35c78eaa9 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/kformula-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.menu b/ubuntu/_base/applications/koffice/debian/kformula-trinity.menu
index e54e6bebd..e54e6bebd 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/kformula-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.mime b/ubuntu/_base/applications/koffice/debian/kformula-trinity.mime
index 5687b0f24..5687b0f24 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.mime
+++ b/ubuntu/_base/applications/koffice/debian/kformula-trinity.mime
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula.1 b/ubuntu/_base/applications/koffice/debian/kformula.1
index ebbd55afb..ebbd55afb 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula.1
+++ b/ubuntu/_base/applications/koffice/debian/kformula.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula.xpm b/ubuntu/_base/applications/koffice/debian/kformula.xpm
index b42f4e220..b42f4e220 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula.xpm
+++ b/ubuntu/_base/applications/koffice/debian/kformula.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.README.Debian
index 0b97a4e69..0b97a4e69 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.docs b/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.docs
index db5dbf658..db5dbf658 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install b/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.install
index def29edd1..def29edd1 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.lintian
index 66e15fdb7..66e15fdb7 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kivio-data-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.docs b/ubuntu/_base/applications/koffice/debian/kivio-trinity.docs
index 0ec5716cd..0ec5716cd 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/kivio-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install b/ubuntu/_base/applications/koffice/debian/kivio-trinity.install
index 289580d09..289580d09 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kivio-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kivio-trinity.lintian
index 1ff9e3f76..1ff9e3f76 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kivio-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.manpages b/ubuntu/_base/applications/koffice/debian/kivio-trinity.manpages
index 1f348c0ca..1f348c0ca 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/kivio-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.menu b/ubuntu/_base/applications/koffice/debian/kivio-trinity.menu
index 46a18fe91..46a18fe91 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/kivio-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.mime b/ubuntu/_base/applications/koffice/debian/kivio-trinity.mime
index 637162677..637162677 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.mime
+++ b/ubuntu/_base/applications/koffice/debian/kivio-trinity.mime
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio.1 b/ubuntu/_base/applications/koffice/debian/kivio.1
index b6557f54f..b6557f54f 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio.1
+++ b/ubuntu/_base/applications/koffice/debian/kivio.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio.xpm b/ubuntu/_base/applications/koffice/debian/kivio.xpm
index 0d9c9b122..0d9c9b122 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio.xpm
+++ b/ubuntu/_base/applications/koffice/debian/kivio.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/koconverter.1 b/ubuntu/_base/applications/koffice/debian/koconverter.1
index 07529ada9..07529ada9 100644
--- a/ubuntu/maverick/applications/koffice/debian/koconverter.1
+++ b/ubuntu/_base/applications/koffice/debian/koconverter.1
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.README.Debian
index fc37e6fb8..fc37e6fb8 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.docs b/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install b/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.install
index 4532ce445..4532ce445 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links b/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.links
index f85e205f2..f85e205f2 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links
+++ b/ubuntu/_base/applications/koffice/debian/koffice-data-trinity.links
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian
index 1feeb83d9..1feeb83d9 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.docs b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.docs
index 53238b144..53238b144 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.install b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.install
index 4be4f26eb..4be4f26eb 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.links
index b0df87ed7..b0df87ed7 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links
+++ b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.links
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.lintian b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.lintian
index 1137a9b12..1137a9b12 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.manpages b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.manpages
index 52c63b5d7..52c63b5d7 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/koffice-libs-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-dev.install b/ubuntu/_base/applications/koffice/debian/koffice-trinity-dev.install
index 4b80b83ec..4b80b83ec 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-dev.install
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-dev.install
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
index bedc6cae9..bedc6cae9 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
index 65271eda0..65271eda0 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
index 0b6a7dbaa..0b6a7dbaa 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
index 4244bd9aa..4244bd9aa 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
index 561d95388..561d95388 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
index 1e5b4ef84..1e5b4ef84 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
index 4d4e5727b..4d4e5727b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
index 09953babd..09953babd 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
index 9e168a19f..9e168a19f 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc.install
index a3aaf470b..a3aaf470b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity-doc.install
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/koffice-trinity.README.Debian
index d463d8fd2..d463d8fd2 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity.docs b/ubuntu/_base/applications/koffice/debian/koffice-trinity.docs
index 53238b144..53238b144 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/koffice-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/koscript.1 b/ubuntu/_base/applications/koffice/debian/koscript.1
index 419c52df0..419c52df0 100644
--- a/ubuntu/maverick/applications/koffice/debian/koscript.1
+++ b/ubuntu/_base/applications/koffice/debian/koscript.1
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.docs b/ubuntu/_base/applications/koffice/debian/koshell-trinity.docs
index 6ade957d9..6ade957d9 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/koshell-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install b/ubuntu/_base/applications/koffice/debian/koshell-trinity.install
index 4b63bd352..4b63bd352 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/koshell-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian b/ubuntu/_base/applications/koffice/debian/koshell-trinity.lintian
index c77411ba2..c77411ba2 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/koshell-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.manpages b/ubuntu/_base/applications/koffice/debian/koshell-trinity.manpages
index fc332a5cc..fc332a5cc 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/koshell-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.menu b/ubuntu/_base/applications/koffice/debian/koshell-trinity.menu
index 5b4872d0f..5b4872d0f 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/koshell-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell.1 b/ubuntu/_base/applications/koffice/debian/koshell.1
index d1dc76870..d1dc76870 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell.1
+++ b/ubuntu/_base/applications/koffice/debian/koshell.1
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell.xpm b/ubuntu/_base/applications/koffice/debian/koshell.xpm
index 25dc6e976..25dc6e976 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell.xpm
+++ b/ubuntu/_base/applications/koffice/debian/koshell.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install b/ubuntu/_base/applications/koffice/debian/kplato-trinity.install
index 8c3df29c3..8c3df29c3 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kplato-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kplato-trinity.lintian
index 74f77679d..74f77679d 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kplato-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kprconverter.pl.1 b/ubuntu/_base/applications/koffice/debian/kprconverter.pl.1
index 635cc9556..635cc9556 100644
--- a/ubuntu/maverick/applications/koffice/debian/kprconverter.pl.1
+++ b/ubuntu/_base/applications/koffice/debian/kprconverter.pl.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install b/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.install
index 78ebe09f2..78ebe09f2 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.lintian
index 8a7a4f113..8a7a4f113 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter-data-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.README.Debian
index fb9aa4fc5..fb9aa4fc5 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.docs b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.docs
index b1fdb5570..b1fdb5570 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.install
index 5aada1cab..5aada1cab 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.lintian
index dc55d0006..dc55d0006 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.manpages b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.manpages
index 3357e6954..3357e6954 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.menu b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.menu
index 1de44f297..1de44f297 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.mime b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.mime
index 9ddd38545..9ddd38545 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.mime
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter-trinity.mime
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter.1 b/ubuntu/_base/applications/koffice/debian/kpresenter.1
index 08eddd41e..08eddd41e 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter.1
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter.xpm b/ubuntu/_base/applications/koffice/debian/kpresenter.xpm
index c1465a6f3..c1465a6f3 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter.xpm
+++ b/ubuntu/_base/applications/koffice/debian/kpresenter.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/kspread-trinity.README.Debian
index ba2b10611..ba2b10611 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/kspread-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.docs b/ubuntu/_base/applications/koffice/debian/kspread-trinity.docs
index 96e2fe386..96e2fe386 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/kspread-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.examples b/ubuntu/_base/applications/koffice/debian/kspread-trinity.examples
index ad588b752..ad588b752 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.examples
+++ b/ubuntu/_base/applications/koffice/debian/kspread-trinity.examples
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install b/ubuntu/_base/applications/koffice/debian/kspread-trinity.install
index ee708351b..ee708351b 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kspread-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kspread-trinity.lintian
index 44cb7cb45..44cb7cb45 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kspread-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.manpages b/ubuntu/_base/applications/koffice/debian/kspread-trinity.manpages
index 833228aec..833228aec 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/kspread-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.menu b/ubuntu/_base/applications/koffice/debian/kspread-trinity.menu
index 995876a1e..995876a1e 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/kspread-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.mime b/ubuntu/_base/applications/koffice/debian/kspread-trinity.mime
index 14b369e46..14b369e46 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.mime
+++ b/ubuntu/_base/applications/koffice/debian/kspread-trinity.mime
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread.1 b/ubuntu/_base/applications/koffice/debian/kspread.1
index 0cf7e8861..0cf7e8861 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread.1
+++ b/ubuntu/_base/applications/koffice/debian/kspread.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread.xpm b/ubuntu/_base/applications/koffice/debian/kspread.xpm
index ddc117b6b..ddc117b6b 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread.xpm
+++ b/ubuntu/_base/applications/koffice/debian/kspread.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install b/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.install
index 1ce19b21c..1ce19b21c 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.lintian
index 252102b05..252102b05 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.manpages b/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.manpages
index 4fb6feb79..4fb6feb79 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.menu b/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.menu
index 66b591d6d..66b591d6d 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/kthesaurus-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus.1 b/ubuntu/_base/applications/koffice/debian/kthesaurus.1
index 32f929bb8..32f929bb8 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus.1
+++ b/ubuntu/_base/applications/koffice/debian/kthesaurus.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus.xpm b/ubuntu/_base/applications/koffice/debian/kthesaurus.xpm
index fec4f069b..fec4f069b 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus.xpm
+++ b/ubuntu/_base/applications/koffice/debian/kthesaurus.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/kudesigner.1 b/ubuntu/_base/applications/koffice/debian/kudesigner.1
index bb08bb355..bb08bb355 100644
--- a/ubuntu/maverick/applications/koffice/debian/kudesigner.1
+++ b/ubuntu/_base/applications/koffice/debian/kudesigner.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/kugar-trinity.README.Debian
index 1e7fd65ce..1e7fd65ce 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.docs b/ubuntu/_base/applications/koffice/debian/kugar-trinity.docs
index 9943eb16c..9943eb16c 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.examples b/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples
index a96de7575..a96de7575 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.examples
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.examples.README b/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples.README
index 9b7cb6fe6..9b7cb6fe6 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.examples.README
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.examples.README
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install b/ubuntu/_base/applications/koffice/debian/kugar-trinity.install
index 0cda2bece..0cda2bece 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.links b/ubuntu/_base/applications/koffice/debian/kugar-trinity.links
index 9a06b3e2f..9a06b3e2f 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.links
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.links
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kugar-trinity.lintian
index 8504ff61f..8504ff61f 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.manpages b/ubuntu/_base/applications/koffice/debian/kugar-trinity.manpages
index 2a72a7d1b..2a72a7d1b 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.menu b/ubuntu/_base/applications/koffice/debian/kugar-trinity.menu
index 2adf48e3f..2adf48e3f 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.mime b/ubuntu/_base/applications/koffice/debian/kugar-trinity.mime
index f731d744f..f731d744f 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.mime
+++ b/ubuntu/_base/applications/koffice/debian/kugar-trinity.mime
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar.1 b/ubuntu/_base/applications/koffice/debian/kugar.1
index 134747aa2..134747aa2 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar.1
+++ b/ubuntu/_base/applications/koffice/debian/kugar.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar.xpm b/ubuntu/_base/applications/koffice/debian/kugar.xpm
index ee5a5a9f6..ee5a5a9f6 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar.xpm
+++ b/ubuntu/_base/applications/koffice/debian/kugar.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install b/ubuntu/_base/applications/koffice/debian/kword-data-trinity.install
index 2d273a850..2d273a850 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kword-data-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kword-data-trinity.lintian
index 09c395552..09c395552 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kword-data-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.README.Debian b/ubuntu/_base/applications/koffice/debian/kword-trinity.README.Debian
index 8f0cd5492..8f0cd5492 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.README.Debian
+++ b/ubuntu/_base/applications/koffice/debian/kword-trinity.README.Debian
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.docs b/ubuntu/_base/applications/koffice/debian/kword-trinity.docs
index 8c00bbf2b..8c00bbf2b 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.docs
+++ b/ubuntu/_base/applications/koffice/debian/kword-trinity.docs
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.examples b/ubuntu/_base/applications/koffice/debian/kword-trinity.examples
index 81458fe9f..81458fe9f 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.examples
+++ b/ubuntu/_base/applications/koffice/debian/kword-trinity.examples
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install b/ubuntu/_base/applications/koffice/debian/kword-trinity.install
index dfeb77b97..dfeb77b97 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/kword-trinity.install
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian b/ubuntu/_base/applications/koffice/debian/kword-trinity.lintian
index 2c396f259..2c396f259 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
+++ b/ubuntu/_base/applications/koffice/debian/kword-trinity.lintian
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.manpages b/ubuntu/_base/applications/koffice/debian/kword-trinity.manpages
index a9bf36729..a9bf36729 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.manpages
+++ b/ubuntu/_base/applications/koffice/debian/kword-trinity.manpages
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.menu b/ubuntu/_base/applications/koffice/debian/kword-trinity.menu
index 629d327e4..629d327e4 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.menu
+++ b/ubuntu/_base/applications/koffice/debian/kword-trinity.menu
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.mime b/ubuntu/_base/applications/koffice/debian/kword-trinity.mime
index 026ac0d2b..026ac0d2b 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.mime
+++ b/ubuntu/_base/applications/koffice/debian/kword-trinity.mime
diff --git a/ubuntu/maverick/applications/koffice/debian/kword.1 b/ubuntu/_base/applications/koffice/debian/kword.1
index e55e7f5f3..e55e7f5f3 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword.1
+++ b/ubuntu/_base/applications/koffice/debian/kword.1
diff --git a/ubuntu/maverick/applications/koffice/debian/kword.xpm b/ubuntu/_base/applications/koffice/debian/kword.xpm
index 38d4f830c..38d4f830c 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword.xpm
+++ b/ubuntu/_base/applications/koffice/debian/kword.xpm
diff --git a/ubuntu/maverick/applications/koffice/debian/not-installed.list b/ubuntu/_base/applications/koffice/debian/not-installed.list
index de62d185f..de62d185f 100644
--- a/ubuntu/maverick/applications/koffice/debian/not-installed.list
+++ b/ubuntu/_base/applications/koffice/debian/not-installed.list
diff --git a/ubuntu/maverick/applications/koffice/debian/patches/series b/ubuntu/_base/applications/koffice/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/koffice/debian/patches/series
+++ b/ubuntu/_base/applications/koffice/debian/patches/series
diff --git a/ubuntu/maverick/applications/koffice/debian/rules b/ubuntu/_base/applications/koffice/debian/rules
index 9e7154a21..9e7154a21 100755
--- a/ubuntu/maverick/applications/koffice/debian/rules
+++ b/ubuntu/_base/applications/koffice/debian/rules
diff --git a/ubuntu/maverick/applications/koffice/debian/source/format b/ubuntu/_base/applications/koffice/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/koffice/debian/source/format
+++ b/ubuntu/_base/applications/koffice/debian/source/format
diff --git a/ubuntu/maverick/applications/koffice/debian/source/options b/ubuntu/_base/applications/koffice/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/koffice/debian/source/options
+++ b/ubuntu/_base/applications/koffice/debian/source/options
diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/konversation/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/konversation/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk b/ubuntu/_base/applications/konversation/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/konversation/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/versions.pl b/ubuntu/_base/applications/konversation/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/konversation/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/konversation/debian/changelog b/ubuntu/_base/applications/konversation/debian/changelog
index aa37d0967..aa37d0967 100644
--- a/ubuntu/maverick/applications/konversation/debian/changelog
+++ b/ubuntu/_base/applications/konversation/debian/changelog
diff --git a/ubuntu/maverick/applications/konversation/debian/compat b/ubuntu/_base/applications/konversation/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/konversation/debian/compat
+++ b/ubuntu/_base/applications/konversation/debian/compat
diff --git a/ubuntu/maverick/applications/konversation/debian/control b/ubuntu/_base/applications/konversation/debian/control
index 6a2afde2d..6a2afde2d 100644
--- a/ubuntu/maverick/applications/konversation/debian/control
+++ b/ubuntu/_base/applications/konversation/debian/control
diff --git a/ubuntu/maverick/applications/konversation/debian/copyright b/ubuntu/_base/applications/konversation/debian/copyright
index 337154e3c..337154e3c 100644
--- a/ubuntu/maverick/applications/konversation/debian/copyright
+++ b/ubuntu/_base/applications/konversation/debian/copyright
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.docs b/ubuntu/_base/applications/konversation/debian/konversation-trinity.docs
index e7f450c0c..e7f450c0c 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.docs
+++ b/ubuntu/_base/applications/konversation/debian/konversation-trinity.docs
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install b/ubuntu/_base/applications/konversation/debian/konversation-trinity.install
index c62ad7db5..c62ad7db5 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install
+++ b/ubuntu/_base/applications/konversation/debian/konversation-trinity.install
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.manpages b/ubuntu/_base/applications/konversation/debian/konversation-trinity.manpages
index 8b3496a3d..8b3496a3d 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.manpages
+++ b/ubuntu/_base/applications/konversation/debian/konversation-trinity.manpages
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.menu b/ubuntu/_base/applications/konversation/debian/konversation-trinity.menu
index 9b45bdc19..9b45bdc19 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.menu
+++ b/ubuntu/_base/applications/konversation/debian/konversation-trinity.menu
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation16x16.xpm b/ubuntu/_base/applications/konversation/debian/konversation16x16.xpm
index 4b4a9376c..4b4a9376c 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation16x16.xpm
+++ b/ubuntu/_base/applications/konversation/debian/konversation16x16.xpm
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation32x32.xpm b/ubuntu/_base/applications/konversation/debian/konversation32x32.xpm
index 60c8f3b0c..60c8f3b0c 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation32x32.xpm
+++ b/ubuntu/_base/applications/konversation/debian/konversation32x32.xpm
diff --git a/ubuntu/maverick/applications/konversation/debian/man/konversation.1.docbook b/ubuntu/_base/applications/konversation/debian/man/konversation.1.docbook
index 719d6e158..719d6e158 100644
--- a/ubuntu/maverick/applications/konversation/debian/man/konversation.1.docbook
+++ b/ubuntu/_base/applications/konversation/debian/man/konversation.1.docbook
diff --git a/ubuntu/maverick/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 3a82060c1..3a82060c1 100644
--- a/ubuntu/maverick/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/ubuntu/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
diff --git a/ubuntu/maverick/applications/konversation/debian/patches/.gitignore b/ubuntu/_base/applications/konversation/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/konversation/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/konversation/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/konversation/debian/rules b/ubuntu/_base/applications/konversation/debian/rules
index 7193b4efb..7193b4efb 100755
--- a/ubuntu/maverick/applications/konversation/debian/rules
+++ b/ubuntu/_base/applications/konversation/debian/rules
diff --git a/ubuntu/maverick/applications/konversation/debian/source/format b/ubuntu/_base/applications/konversation/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/konversation/debian/source/format
+++ b/ubuntu/_base/applications/konversation/debian/source/format
diff --git a/ubuntu/maverick/applications/konversation/debian/source/options b/ubuntu/_base/applications/konversation/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/konversation/debian/source/options
+++ b/ubuntu/_base/applications/konversation/debian/source/options
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk b/ubuntu/_base/applications/kopete-otr/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kopete-otr/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/versions.pl b/ubuntu/_base/applications/kopete-otr/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kopete-otr/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/changelog b/ubuntu/_base/applications/kopete-otr/debian/changelog
index f424502b9..f424502b9 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/changelog
+++ b/ubuntu/_base/applications/kopete-otr/debian/changelog
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/compat b/ubuntu/_base/applications/kopete-otr/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/compat
+++ b/ubuntu/_base/applications/kopete-otr/debian/compat
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/control b/ubuntu/_base/applications/kopete-otr/debian/control
index 1a90521ed..1a90521ed 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/control
+++ b/ubuntu/_base/applications/kopete-otr/debian/control
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/copyright b/ubuntu/_base/applications/kopete-otr/debian/copyright
index 86dcae02e..86dcae02e 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/copyright
+++ b/ubuntu/_base/applications/kopete-otr/debian/copyright
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/rules b/ubuntu/_base/applications/kopete-otr/debian/rules
index e466423d3..e466423d3 100755
--- a/ubuntu/maverick/applications/kopete-otr/debian/rules
+++ b/ubuntu/_base/applications/kopete-otr/debian/rules
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/source/format b/ubuntu/_base/applications/kopete-otr/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/source/format
+++ b/ubuntu/_base/applications/kopete-otr/debian/source/format
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/source/options b/ubuntu/_base/applications/kopete-otr/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/source/options
+++ b/ubuntu/_base/applications/kopete-otr/debian/source/options
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/watch b/ubuntu/_base/applications/kopete-otr/debian/watch
index 50ddb75fa..50ddb75fa 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/watch
+++ b/ubuntu/_base/applications/kopete-otr/debian/watch
diff --git a/ubuntu/maverick/applications/kpicosim/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kpicosim/debian/cdbs/kde.mk b/ubuntu/_base/applications/kpicosim/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kpicosim/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kpicosim/debian/cdbs/versions.pl b/ubuntu/_base/applications/kpicosim/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kpicosim/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kpicosim/debian/changelog b/ubuntu/_base/applications/kpicosim/debian/changelog
index 5d239becc..5d239becc 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/changelog
+++ b/ubuntu/_base/applications/kpicosim/debian/changelog
diff --git a/ubuntu/maverick/applications/kpicosim/debian/compat b/ubuntu/_base/applications/kpicosim/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/compat
+++ b/ubuntu/_base/applications/kpicosim/debian/compat
diff --git a/ubuntu/maverick/applications/kpicosim/debian/control b/ubuntu/_base/applications/kpicosim/debian/control
index ff0023ee9..ff0023ee9 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/control
+++ b/ubuntu/_base/applications/kpicosim/debian/control
diff --git a/ubuntu/maverick/applications/kpicosim/debian/copyright b/ubuntu/_base/applications/kpicosim/debian/copyright
index 1e968a7a0..1e968a7a0 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/copyright
+++ b/ubuntu/_base/applications/kpicosim/debian/copyright
diff --git a/ubuntu/maverick/applications/kpicosim/debian/docs b/ubuntu/_base/applications/kpicosim/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/docs
+++ b/ubuntu/_base/applications/kpicosim/debian/docs
diff --git a/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links b/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.links
index 78a8ee9df..78a8ee9df 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links
+++ b/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.links
diff --git a/ubuntu/maverick/applications/kpicosim/debian/menu b/ubuntu/_base/applications/kpicosim/debian/menu
index dba595bc0..dba595bc0 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/menu
+++ b/ubuntu/_base/applications/kpicosim/debian/menu
diff --git a/ubuntu/maverick/applications/kpicosim/debian/rules b/ubuntu/_base/applications/kpicosim/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kpicosim/debian/rules
+++ b/ubuntu/_base/applications/kpicosim/debian/rules
diff --git a/ubuntu/maverick/applications/kpicosim/debian/source/format b/ubuntu/_base/applications/kpicosim/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/source/format
+++ b/ubuntu/_base/applications/kpicosim/debian/source/format
diff --git a/ubuntu/maverick/applications/kpicosim/debian/source/options b/ubuntu/_base/applications/kpicosim/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/source/options
+++ b/ubuntu/_base/applications/kpicosim/debian/source/options
diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kpilot/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk b/ubuntu/_base/applications/kpilot/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kpilot/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/versions.pl b/ubuntu/_base/applications/kpilot/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kpilot/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kpilot/debian/changelog b/ubuntu/_base/applications/kpilot/debian/changelog
index 033be0529..033be0529 100644
--- a/ubuntu/maverick/applications/kpilot/debian/changelog
+++ b/ubuntu/_base/applications/kpilot/debian/changelog
diff --git a/ubuntu/maverick/applications/kpilot/debian/compat b/ubuntu/_base/applications/kpilot/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kpilot/debian/compat
+++ b/ubuntu/_base/applications/kpilot/debian/compat
diff --git a/ubuntu/maverick/applications/kpilot/debian/control b/ubuntu/_base/applications/kpilot/debian/control
index 047874be9..047874be9 100644
--- a/ubuntu/maverick/applications/kpilot/debian/control
+++ b/ubuntu/_base/applications/kpilot/debian/control
diff --git a/ubuntu/maverick/applications/kpilot/debian/copyright b/ubuntu/_base/applications/kpilot/debian/copyright
index 86dcae02e..86dcae02e 100644
--- a/ubuntu/maverick/applications/kpilot/debian/copyright
+++ b/ubuntu/_base/applications/kpilot/debian/copyright
diff --git a/ubuntu/maverick/applications/kpilot/debian/kpilot-trinity.install b/ubuntu/_base/applications/kpilot/debian/kpilot-trinity.install
index bd25c982e..bd25c982e 100644
--- a/ubuntu/maverick/applications/kpilot/debian/kpilot-trinity.install
+++ b/ubuntu/_base/applications/kpilot/debian/kpilot-trinity.install
diff --git a/ubuntu/maverick/applications/kpilot/debian/rules b/ubuntu/_base/applications/kpilot/debian/rules
index ba4d76be0..ba4d76be0 100755
--- a/ubuntu/maverick/applications/kpilot/debian/rules
+++ b/ubuntu/_base/applications/kpilot/debian/rules
diff --git a/ubuntu/maverick/applications/kpilot/debian/source/format b/ubuntu/_base/applications/kpilot/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kpilot/debian/source/format
+++ b/ubuntu/_base/applications/kpilot/debian/source/format
diff --git a/ubuntu/maverick/applications/kpilot/debian/source/options b/ubuntu/_base/applications/kpilot/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kpilot/debian/source/options
+++ b/ubuntu/_base/applications/kpilot/debian/source/options
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/_base/applications/kpowersave/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kpowersave/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/versions.pl b/ubuntu/_base/applications/kpowersave/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kpowersave/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kpowersave/debian/changelog b/ubuntu/_base/applications/kpowersave/debian/changelog
index 555de82cf..555de82cf 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/changelog
+++ b/ubuntu/_base/applications/kpowersave/debian/changelog
diff --git a/ubuntu/maverick/applications/kpowersave/debian/compat b/ubuntu/_base/applications/kpowersave/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/compat
+++ b/ubuntu/_base/applications/kpowersave/debian/compat
diff --git a/ubuntu/maverick/applications/kpowersave/debian/control b/ubuntu/_base/applications/kpowersave/debian/control
index 0429994f6..0429994f6 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/control
+++ b/ubuntu/_base/applications/kpowersave/debian/control
diff --git a/ubuntu/maverick/applications/kpowersave/debian/copyright b/ubuntu/_base/applications/kpowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/copyright
+++ b/ubuntu/_base/applications/kpowersave/debian/copyright
diff --git a/ubuntu/maverick/applications/kpowersave/debian/install b/ubuntu/_base/applications/kpowersave/debian/install
index 7b00dd534..7b00dd534 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/install
+++ b/ubuntu/_base/applications/kpowersave/debian/install
diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda b/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.linda
index 35bdc35cd..35bdc35cd 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda
+++ b/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.linda
diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.lintian
index 8f6135226..8f6135226 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/ubuntu/_base/applications/kpowersave/debian/kpowersave-trinity.lintian
diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave.1 b/ubuntu/_base/applications/kpowersave/debian/kpowersave.1
index 1f816da69..1f816da69 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave.1
+++ b/ubuntu/_base/applications/kpowersave/debian/kpowersave.1
diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave.xpm b/ubuntu/_base/applications/kpowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave.xpm
+++ b/ubuntu/_base/applications/kpowersave/debian/kpowersave.xpm
diff --git a/ubuntu/maverick/applications/kpowersave/debian/manpages b/ubuntu/_base/applications/kpowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/manpages
+++ b/ubuntu/_base/applications/kpowersave/debian/manpages
diff --git a/ubuntu/maverick/applications/kpowersave/debian/menu b/ubuntu/_base/applications/kpowersave/debian/menu
index c875d9194..c875d9194 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/menu
+++ b/ubuntu/_base/applications/kpowersave/debian/menu
diff --git a/ubuntu/maverick/applications/kpowersave/debian/patches/series b/ubuntu/_base/applications/kpowersave/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/patches/series
+++ b/ubuntu/_base/applications/kpowersave/debian/patches/series
diff --git a/ubuntu/maverick/applications/kpowersave/debian/postinst b/ubuntu/_base/applications/kpowersave/debian/postinst
index cf7c41189..cf7c41189 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/postinst
+++ b/ubuntu/_base/applications/kpowersave/debian/postinst
diff --git a/ubuntu/maverick/applications/kpowersave/debian/postrm b/ubuntu/_base/applications/kpowersave/debian/postrm
index 99bd13d89..99bd13d89 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/postrm
+++ b/ubuntu/_base/applications/kpowersave/debian/postrm
diff --git a/ubuntu/maverick/applications/kpowersave/debian/preinst b/ubuntu/_base/applications/kpowersave/debian/preinst
index 3fe8514bd..3fe8514bd 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/preinst
+++ b/ubuntu/_base/applications/kpowersave/debian/preinst
diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/_base/applications/kpowersave/debian/rules
index 0707e138e..0707e138e 100755
--- a/ubuntu/maverick/applications/kpowersave/debian/rules
+++ b/ubuntu/_base/applications/kpowersave/debian/rules
diff --git a/ubuntu/maverick/applications/kpowersave/debian/source/format b/ubuntu/_base/applications/kpowersave/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/source/format
+++ b/ubuntu/_base/applications/kpowersave/debian/source/format
diff --git a/ubuntu/maverick/applications/kpowersave/debian/source/options b/ubuntu/_base/applications/kpowersave/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/source/options
+++ b/ubuntu/_base/applications/kpowersave/debian/source/options
diff --git a/ubuntu/maverick/applications/kpowersave/debian/watch b/ubuntu/_base/applications/kpowersave/debian/watch
index 832285e63..832285e63 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/watch
+++ b/ubuntu/_base/applications/kpowersave/debian/watch
diff --git a/ubuntu/maverick/applications/krecipes/debian/README.source b/ubuntu/_base/applications/krecipes/debian/README.source
index b1eacedd0..b1eacedd0 100644
--- a/ubuntu/maverick/applications/krecipes/debian/README.source
+++ b/ubuntu/_base/applications/krecipes/debian/README.source
diff --git a/ubuntu/maverick/applications/krecipes/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/krecipes/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/krecipes/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/krecipes/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/krecipes/debian/cdbs/kde.mk b/ubuntu/_base/applications/krecipes/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/krecipes/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/krecipes/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/krecipes/debian/cdbs/versions.pl b/ubuntu/_base/applications/krecipes/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/krecipes/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/krecipes/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/krecipes/debian/changelog b/ubuntu/_base/applications/krecipes/debian/changelog
index 2f4e1b459..2f4e1b459 100644
--- a/ubuntu/maverick/applications/krecipes/debian/changelog
+++ b/ubuntu/_base/applications/krecipes/debian/changelog
diff --git a/ubuntu/maverick/applications/krecipes/debian/compat b/ubuntu/_base/applications/krecipes/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/krecipes/debian/compat
+++ b/ubuntu/_base/applications/krecipes/debian/compat
diff --git a/ubuntu/maverick/applications/krecipes/debian/control b/ubuntu/_base/applications/krecipes/debian/control
index 08412f00a..08412f00a 100644
--- a/ubuntu/maverick/applications/krecipes/debian/control
+++ b/ubuntu/_base/applications/krecipes/debian/control
diff --git a/ubuntu/maverick/applications/krecipes/debian/copyright b/ubuntu/_base/applications/krecipes/debian/copyright
index 0d9b57f90..0d9b57f90 100644
--- a/ubuntu/maverick/applications/krecipes/debian/copyright
+++ b/ubuntu/_base/applications/krecipes/debian/copyright
diff --git a/ubuntu/maverick/applications/krecipes/debian/krecipes-data-trinity.install b/ubuntu/_base/applications/krecipes/debian/krecipes-data-trinity.install
index 8c3677c1a..8c3677c1a 100644
--- a/ubuntu/maverick/applications/krecipes/debian/krecipes-data-trinity.install
+++ b/ubuntu/_base/applications/krecipes/debian/krecipes-data-trinity.install
diff --git a/ubuntu/maverick/applications/krecipes/debian/krecipes-data-trinity.manpages b/ubuntu/_base/applications/krecipes/debian/krecipes-data-trinity.manpages
index 196cdc430..196cdc430 100644
--- a/ubuntu/maverick/applications/krecipes/debian/krecipes-data-trinity.manpages
+++ b/ubuntu/_base/applications/krecipes/debian/krecipes-data-trinity.manpages
diff --git a/ubuntu/maverick/applications/krecipes/debian/krecipes-doc-trinity.install b/ubuntu/_base/applications/krecipes/debian/krecipes-doc-trinity.install
index d19b7d902..d19b7d902 100644
--- a/ubuntu/maverick/applications/krecipes/debian/krecipes-doc-trinity.install
+++ b/ubuntu/_base/applications/krecipes/debian/krecipes-doc-trinity.install
diff --git a/ubuntu/maverick/applications/krecipes/debian/krecipes-trinity.install b/ubuntu/_base/applications/krecipes/debian/krecipes-trinity.install
index b40fc39e9..b40fc39e9 100644
--- a/ubuntu/maverick/applications/krecipes/debian/krecipes-trinity.install
+++ b/ubuntu/_base/applications/krecipes/debian/krecipes-trinity.install
diff --git a/ubuntu/maverick/applications/krecipes/debian/krecipes-trinity.lintian b/ubuntu/_base/applications/krecipes/debian/krecipes-trinity.lintian
index 6fd5c88d0..6fd5c88d0 100644
--- a/ubuntu/maverick/applications/krecipes/debian/krecipes-trinity.lintian
+++ b/ubuntu/_base/applications/krecipes/debian/krecipes-trinity.lintian
diff --git a/ubuntu/maverick/applications/krecipes/debian/krecipes-trinity.menu b/ubuntu/_base/applications/krecipes/debian/krecipes-trinity.menu
index e39a9ecb4..e39a9ecb4 100644
--- a/ubuntu/maverick/applications/krecipes/debian/krecipes-trinity.menu
+++ b/ubuntu/_base/applications/krecipes/debian/krecipes-trinity.menu
diff --git a/ubuntu/maverick/applications/krecipes/debian/krecipes.1 b/ubuntu/_base/applications/krecipes/debian/krecipes.1
index aaf56f777..aaf56f777 100644
--- a/ubuntu/maverick/applications/krecipes/debian/krecipes.1
+++ b/ubuntu/_base/applications/krecipes/debian/krecipes.1
diff --git a/ubuntu/maverick/applications/krecipes/debian/krecipes.xpm b/ubuntu/_base/applications/krecipes/debian/krecipes.xpm
index a99416613..a99416613 100644
--- a/ubuntu/maverick/applications/krecipes/debian/krecipes.xpm
+++ b/ubuntu/_base/applications/krecipes/debian/krecipes.xpm
diff --git a/ubuntu/maverick/applications/krecipes/debian/rules b/ubuntu/_base/applications/krecipes/debian/rules
index 5a49f651f..5a49f651f 100755
--- a/ubuntu/maverick/applications/krecipes/debian/rules
+++ b/ubuntu/_base/applications/krecipes/debian/rules
diff --git a/ubuntu/maverick/applications/krecipes/debian/source/format b/ubuntu/_base/applications/krecipes/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/krecipes/debian/source/format
+++ b/ubuntu/_base/applications/krecipes/debian/source/format
diff --git a/ubuntu/maverick/applications/krecipes/debian/source/options b/ubuntu/_base/applications/krecipes/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/krecipes/debian/source/options
+++ b/ubuntu/_base/applications/krecipes/debian/source/options
diff --git a/ubuntu/maverick/applications/krecipes/debian/watch b/ubuntu/_base/applications/krecipes/debian/watch
index 9bc512dee..9bc512dee 100644
--- a/ubuntu/maverick/applications/krecipes/debian/watch
+++ b/ubuntu/_base/applications/krecipes/debian/watch
diff --git a/ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/krename/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/krename/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/krename/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/krename/debian/cdbs/kde.mk b/ubuntu/_base/applications/krename/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/krename/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/krename/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/krename/debian/cdbs/versions.pl b/ubuntu/_base/applications/krename/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/krename/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/krename/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/krename/debian/changelog b/ubuntu/_base/applications/krename/debian/changelog
index d574638b6..d574638b6 100644
--- a/ubuntu/maverick/applications/krename/debian/changelog
+++ b/ubuntu/_base/applications/krename/debian/changelog
diff --git a/ubuntu/maverick/applications/krename/debian/compat b/ubuntu/_base/applications/krename/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/krename/debian/compat
+++ b/ubuntu/_base/applications/krename/debian/compat
diff --git a/ubuntu/maverick/applications/krename/debian/control b/ubuntu/_base/applications/krename/debian/control
index f59280917..f59280917 100644
--- a/ubuntu/maverick/applications/krename/debian/control
+++ b/ubuntu/_base/applications/krename/debian/control
diff --git a/ubuntu/maverick/applications/krename/debian/copyright b/ubuntu/_base/applications/krename/debian/copyright
index e90f32cab..e90f32cab 100644
--- a/ubuntu/maverick/applications/krename/debian/copyright
+++ b/ubuntu/_base/applications/krename/debian/copyright
diff --git a/ubuntu/maverick/applications/krename/debian/docs b/ubuntu/_base/applications/krename/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/maverick/applications/krename/debian/docs
+++ b/ubuntu/_base/applications/krename/debian/docs
diff --git a/ubuntu/maverick/applications/krename/debian/patches/series b/ubuntu/_base/applications/krename/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/krename/debian/patches/series
+++ b/ubuntu/_base/applications/krename/debian/patches/series
diff --git a/ubuntu/maverick/applications/krename/debian/rules b/ubuntu/_base/applications/krename/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/krename/debian/rules
+++ b/ubuntu/_base/applications/krename/debian/rules
diff --git a/ubuntu/maverick/applications/krename/debian/source/format b/ubuntu/_base/applications/krename/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/krename/debian/source/format
+++ b/ubuntu/_base/applications/krename/debian/source/format
diff --git a/ubuntu/maverick/applications/krename/debian/source/options b/ubuntu/_base/applications/krename/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/krename/debian/source/options
+++ b/ubuntu/_base/applications/krename/debian/source/options
diff --git a/ubuntu/maverick/applications/krusader/debian/README.Debian b/ubuntu/_base/applications/krusader/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/applications/krusader/debian/README.Debian
+++ b/ubuntu/_base/applications/krusader/debian/README.Debian
diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/krusader/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/krusader/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk b/ubuntu/_base/applications/krusader/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/krusader/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/versions.pl b/ubuntu/_base/applications/krusader/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/krusader/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/krusader/debian/changelog b/ubuntu/_base/applications/krusader/debian/changelog
index a3adc8279..a3adc8279 100644
--- a/ubuntu/maverick/applications/krusader/debian/changelog
+++ b/ubuntu/_base/applications/krusader/debian/changelog
diff --git a/ubuntu/maverick/applications/krusader/debian/compat b/ubuntu/_base/applications/krusader/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/krusader/debian/compat
+++ b/ubuntu/_base/applications/krusader/debian/compat
diff --git a/ubuntu/maverick/applications/krusader/debian/control b/ubuntu/_base/applications/krusader/debian/control
index 6b4757c10..6b4757c10 100644
--- a/ubuntu/maverick/applications/krusader/debian/control
+++ b/ubuntu/_base/applications/krusader/debian/control
diff --git a/ubuntu/maverick/applications/krusader/debian/copyright b/ubuntu/_base/applications/krusader/debian/copyright
index 4f0e31c89..4f0e31c89 100644
--- a/ubuntu/maverick/applications/krusader/debian/copyright
+++ b/ubuntu/_base/applications/krusader/debian/copyright
diff --git a/ubuntu/maverick/applications/krusader/debian/docs b/ubuntu/_base/applications/krusader/debian/docs
index 623fe2da9..623fe2da9 100644
--- a/ubuntu/maverick/applications/krusader/debian/docs
+++ b/ubuntu/_base/applications/krusader/debian/docs
diff --git a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides b/ubuntu/_base/applications/krusader/debian/krusader.lintian-overrides
index 62bf48233..62bf48233 100644
--- a/ubuntu/maverick/applications/krusader/debian/krusader.lintian-overrides
+++ b/ubuntu/_base/applications/krusader/debian/krusader.lintian-overrides
diff --git a/ubuntu/maverick/applications/krusader/debian/menu b/ubuntu/_base/applications/krusader/debian/menu
index d57ccc878..d57ccc878 100644
--- a/ubuntu/maverick/applications/krusader/debian/menu
+++ b/ubuntu/_base/applications/krusader/debian/menu
diff --git a/ubuntu/maverick/applications/krusader/debian/patches/series b/ubuntu/_base/applications/krusader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/krusader/debian/patches/series
+++ b/ubuntu/_base/applications/krusader/debian/patches/series
diff --git a/ubuntu/maverick/applications/krusader/debian/rules b/ubuntu/_base/applications/krusader/debian/rules
index ee5af1b42..ee5af1b42 100755
--- a/ubuntu/maverick/applications/krusader/debian/rules
+++ b/ubuntu/_base/applications/krusader/debian/rules
diff --git a/ubuntu/maverick/applications/krusader/debian/source.lintian-overrides b/ubuntu/_base/applications/krusader/debian/source.lintian-overrides
index 01d57f16c..01d57f16c 100644
--- a/ubuntu/maverick/applications/krusader/debian/source.lintian-overrides
+++ b/ubuntu/_base/applications/krusader/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/applications/krusader/debian/source/format b/ubuntu/_base/applications/krusader/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/krusader/debian/source/format
+++ b/ubuntu/_base/applications/krusader/debian/source/format
diff --git a/ubuntu/maverick/applications/krusader/debian/source/options b/ubuntu/_base/applications/krusader/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/krusader/debian/source/options
+++ b/ubuntu/_base/applications/krusader/debian/source/options
diff --git a/ubuntu/maverick/applications/krusader/debian/watch b/ubuntu/_base/applications/krusader/debian/watch
index d19bef39d..d19bef39d 100644
--- a/ubuntu/maverick/applications/krusader/debian/watch
+++ b/ubuntu/_base/applications/krusader/debian/watch
diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kscope/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kscope/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kscope/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk b/ubuntu/_base/applications/kscope/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kscope/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/versions.pl b/ubuntu/_base/applications/kscope/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kscope/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kscope/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kscope/debian/changelog b/ubuntu/_base/applications/kscope/debian/changelog
index f197361ae..f197361ae 100644
--- a/ubuntu/maverick/applications/kscope/debian/changelog
+++ b/ubuntu/_base/applications/kscope/debian/changelog
diff --git a/ubuntu/maverick/applications/kscope/debian/compat b/ubuntu/_base/applications/kscope/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kscope/debian/compat
+++ b/ubuntu/_base/applications/kscope/debian/compat
diff --git a/ubuntu/maverick/applications/kscope/debian/control b/ubuntu/_base/applications/kscope/debian/control
index a8843815f..a8843815f 100644
--- a/ubuntu/maverick/applications/kscope/debian/control
+++ b/ubuntu/_base/applications/kscope/debian/control
diff --git a/ubuntu/maverick/applications/kscope/debian/copyright b/ubuntu/_base/applications/kscope/debian/copyright
index 6149f4244..6149f4244 100644
--- a/ubuntu/maverick/applications/kscope/debian/copyright
+++ b/ubuntu/_base/applications/kscope/debian/copyright
diff --git a/ubuntu/maverick/applications/kscope/debian/docs b/ubuntu/_base/applications/kscope/debian/docs
index 1333ed77b..1333ed77b 100644
--- a/ubuntu/maverick/applications/kscope/debian/docs
+++ b/ubuntu/_base/applications/kscope/debian/docs
diff --git a/ubuntu/maverick/applications/kscope/debian/kscope.xml b/ubuntu/_base/applications/kscope/debian/kscope.xml
index a70b1be45..a70b1be45 100644
--- a/ubuntu/maverick/applications/kscope/debian/kscope.xml
+++ b/ubuntu/_base/applications/kscope/debian/kscope.xml
diff --git a/ubuntu/maverick/applications/kscope/debian/manpages b/ubuntu/_base/applications/kscope/debian/manpages
index 03ff43b50..03ff43b50 100644
--- a/ubuntu/maverick/applications/kscope/debian/manpages
+++ b/ubuntu/_base/applications/kscope/debian/manpages
diff --git a/ubuntu/maverick/applications/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/_base/applications/kscope/debian/patches/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/applications/kscope/debian/patches/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/applications/kscope/debian/patches/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/applications/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/_base/applications/kscope/debian/patches/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/applications/kscope/debian/patches/06_disable_no_undefined.diff
+++ b/ubuntu/_base/applications/kscope/debian/patches/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/applications/kscope/debian/patches/series b/ubuntu/_base/applications/kscope/debian/patches/series
index b8743ddd9..b8743ddd9 100644
--- a/ubuntu/maverick/applications/kscope/debian/patches/series
+++ b/ubuntu/_base/applications/kscope/debian/patches/series
diff --git a/ubuntu/maverick/applications/kscope/debian/rules b/ubuntu/_base/applications/kscope/debian/rules
index 21f3c56c4..21f3c56c4 100755
--- a/ubuntu/maverick/applications/kscope/debian/rules
+++ b/ubuntu/_base/applications/kscope/debian/rules
diff --git a/ubuntu/maverick/applications/kscope/debian/source/format b/ubuntu/_base/applications/kscope/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kscope/debian/source/format
+++ b/ubuntu/_base/applications/kscope/debian/source/format
diff --git a/ubuntu/maverick/applications/kscope/debian/source/options b/ubuntu/_base/applications/kscope/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kscope/debian/source/options
+++ b/ubuntu/_base/applications/kscope/debian/source/options
diff --git a/ubuntu/maverick/applications/kscope/debian/watch b/ubuntu/_base/applications/kscope/debian/watch
index 6825f61dd..6825f61dd 100644
--- a/ubuntu/maverick/applications/kscope/debian/watch
+++ b/ubuntu/_base/applications/kscope/debian/watch
diff --git a/ubuntu/maverick/applications/ksensors/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/ksensors/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/ksensors/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/ksensors/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/ksensors/debian/cdbs/kde.mk b/ubuntu/_base/applications/ksensors/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/ksensors/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/ksensors/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/ksensors/debian/cdbs/versions.pl b/ubuntu/_base/applications/ksensors/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/ksensors/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/ksensors/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/ksensors/debian/changelog b/ubuntu/_base/applications/ksensors/debian/changelog
index e9f5198ae..e9f5198ae 100644
--- a/ubuntu/maverick/applications/ksensors/debian/changelog
+++ b/ubuntu/_base/applications/ksensors/debian/changelog
diff --git a/ubuntu/maverick/applications/ksensors/debian/compat b/ubuntu/_base/applications/ksensors/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/ksensors/debian/compat
+++ b/ubuntu/_base/applications/ksensors/debian/compat
diff --git a/ubuntu/maverick/applications/ksensors/debian/control b/ubuntu/_base/applications/ksensors/debian/control
index 7b31badb0..7b31badb0 100644
--- a/ubuntu/maverick/applications/ksensors/debian/control
+++ b/ubuntu/_base/applications/ksensors/debian/control
diff --git a/ubuntu/maverick/applications/ksensors/debian/copyright b/ubuntu/_base/applications/ksensors/debian/copyright
index 354853a55..354853a55 100644
--- a/ubuntu/maverick/applications/ksensors/debian/copyright
+++ b/ubuntu/_base/applications/ksensors/debian/copyright
diff --git a/ubuntu/maverick/applications/ksensors/debian/dirs b/ubuntu/_base/applications/ksensors/debian/dirs
index cae0d6764..cae0d6764 100644
--- a/ubuntu/maverick/applications/ksensors/debian/dirs
+++ b/ubuntu/_base/applications/ksensors/debian/dirs
diff --git a/ubuntu/maverick/applications/ksensors/debian/docs b/ubuntu/_base/applications/ksensors/debian/docs
index e31aa157a..e31aa157a 100644
--- a/ubuntu/maverick/applications/ksensors/debian/docs
+++ b/ubuntu/_base/applications/ksensors/debian/docs
diff --git a/ubuntu/maverick/applications/ksensors/debian/menu b/ubuntu/_base/applications/ksensors/debian/menu
index b4a2919d6..b4a2919d6 100644
--- a/ubuntu/maverick/applications/ksensors/debian/menu
+++ b/ubuntu/_base/applications/ksensors/debian/menu
diff --git a/ubuntu/maverick/applications/ksensors/debian/patches/series b/ubuntu/_base/applications/ksensors/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ksensors/debian/patches/series
+++ b/ubuntu/_base/applications/ksensors/debian/patches/series
diff --git a/ubuntu/maverick/applications/ksensors/debian/rules b/ubuntu/_base/applications/ksensors/debian/rules
index 00e4d7fb4..00e4d7fb4 100755
--- a/ubuntu/maverick/applications/ksensors/debian/rules
+++ b/ubuntu/_base/applications/ksensors/debian/rules
diff --git a/ubuntu/maverick/applications/ksensors/debian/source/format b/ubuntu/_base/applications/ksensors/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/ksensors/debian/source/format
+++ b/ubuntu/_base/applications/ksensors/debian/source/format
diff --git a/ubuntu/maverick/applications/ksensors/debian/source/options b/ubuntu/_base/applications/ksensors/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/ksensors/debian/source/options
+++ b/ubuntu/_base/applications/ksensors/debian/source/options
diff --git a/ubuntu/maverick/applications/kshowmail/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kshowmail/debian/cdbs/kde.mk b/ubuntu/_base/applications/kshowmail/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kshowmail/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kshowmail/debian/cdbs/versions.pl b/ubuntu/_base/applications/kshowmail/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kshowmail/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kshowmail/debian/changelog b/ubuntu/_base/applications/kshowmail/debian/changelog
index bc26cf7a4..bc26cf7a4 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/changelog
+++ b/ubuntu/_base/applications/kshowmail/debian/changelog
diff --git a/ubuntu/maverick/applications/kshowmail/debian/compat b/ubuntu/_base/applications/kshowmail/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/compat
+++ b/ubuntu/_base/applications/kshowmail/debian/compat
diff --git a/ubuntu/maverick/applications/kshowmail/debian/control b/ubuntu/_base/applications/kshowmail/debian/control
index 86e963b17..86e963b17 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/control
+++ b/ubuntu/_base/applications/kshowmail/debian/control
diff --git a/ubuntu/maverick/applications/kshowmail/debian/copyright b/ubuntu/_base/applications/kshowmail/debian/copyright
index b0cfa740c..b0cfa740c 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/copyright
+++ b/ubuntu/_base/applications/kshowmail/debian/copyright
diff --git a/ubuntu/maverick/applications/kshowmail/debian/kshowmail.1 b/ubuntu/_base/applications/kshowmail/debian/kshowmail.1
index 6903cf457..6903cf457 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/kshowmail.1
+++ b/ubuntu/_base/applications/kshowmail/debian/kshowmail.1
diff --git a/ubuntu/maverick/applications/kshowmail/debian/manpages b/ubuntu/_base/applications/kshowmail/debian/manpages
index c0449925d..c0449925d 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/manpages
+++ b/ubuntu/_base/applications/kshowmail/debian/manpages
diff --git a/ubuntu/maverick/applications/kshowmail/debian/menu b/ubuntu/_base/applications/kshowmail/debian/menu
index 78d095adc..78d095adc 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/menu
+++ b/ubuntu/_base/applications/kshowmail/debian/menu
diff --git a/ubuntu/maverick/applications/kshowmail/debian/rules b/ubuntu/_base/applications/kshowmail/debian/rules
index 43b4c08dd..43b4c08dd 100755
--- a/ubuntu/maverick/applications/kshowmail/debian/rules
+++ b/ubuntu/_base/applications/kshowmail/debian/rules
diff --git a/ubuntu/maverick/applications/kshowmail/debian/source/format b/ubuntu/_base/applications/kshowmail/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/source/format
+++ b/ubuntu/_base/applications/kshowmail/debian/source/format
diff --git a/ubuntu/maverick/applications/kshowmail/debian/source/options b/ubuntu/_base/applications/kshowmail/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/source/options
+++ b/ubuntu/_base/applications/kshowmail/debian/source/options
diff --git a/ubuntu/maverick/applications/kshowmail/debian/watch b/ubuntu/_base/applications/kshowmail/debian/watch
index 317ab71ce..317ab71ce 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/watch
+++ b/ubuntu/_base/applications/kshowmail/debian/watch
diff --git a/ubuntu/maverick/applications/kshutdown/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kshutdown/debian/cdbs/kde.mk b/ubuntu/_base/applications/kshutdown/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kshutdown/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kshutdown/debian/cdbs/versions.pl b/ubuntu/_base/applications/kshutdown/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kshutdown/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kshutdown/debian/changelog b/ubuntu/_base/applications/kshutdown/debian/changelog
index 75cf3565b..75cf3565b 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/changelog
+++ b/ubuntu/_base/applications/kshutdown/debian/changelog
diff --git a/ubuntu/maverick/applications/kshutdown/debian/compat b/ubuntu/_base/applications/kshutdown/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/compat
+++ b/ubuntu/_base/applications/kshutdown/debian/compat
diff --git a/ubuntu/maverick/applications/kshutdown/debian/control b/ubuntu/_base/applications/kshutdown/debian/control
index 5b7da3693..5b7da3693 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/control
+++ b/ubuntu/_base/applications/kshutdown/debian/control
diff --git a/ubuntu/maverick/applications/kshutdown/debian/copyright b/ubuntu/_base/applications/kshutdown/debian/copyright
index dc1726a85..dc1726a85 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/copyright
+++ b/ubuntu/_base/applications/kshutdown/debian/copyright
diff --git a/ubuntu/maverick/applications/kshutdown/debian/dirs b/ubuntu/_base/applications/kshutdown/debian/dirs
index f583045fe..f583045fe 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/dirs
+++ b/ubuntu/_base/applications/kshutdown/debian/dirs
diff --git a/ubuntu/maverick/applications/kshutdown/debian/docs b/ubuntu/_base/applications/kshutdown/debian/docs
index 9341bcf45..9341bcf45 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/docs
+++ b/ubuntu/_base/applications/kshutdown/debian/docs
diff --git a/ubuntu/maverick/applications/kshutdown/debian/rules b/ubuntu/_base/applications/kshutdown/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kshutdown/debian/rules
+++ b/ubuntu/_base/applications/kshutdown/debian/rules
diff --git a/ubuntu/maverick/applications/kshutdown/debian/source/format b/ubuntu/_base/applications/kshutdown/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/source/format
+++ b/ubuntu/_base/applications/kshutdown/debian/source/format
diff --git a/ubuntu/maverick/applications/kshutdown/debian/source/options b/ubuntu/_base/applications/kshutdown/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/source/options
+++ b/ubuntu/_base/applications/kshutdown/debian/source/options
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/kde.mk b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/versions.pl b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/changelog b/ubuntu/_base/applications/ksplash-engine-moodin/debian/changelog
index 690318477..690318477 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/changelog
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/changelog
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/compat b/ubuntu/_base/applications/ksplash-engine-moodin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/compat
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/compat
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control b/ubuntu/_base/applications/ksplash-engine-moodin/debian/control
index 6ea721ebf..6ea721ebf 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/control
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/control
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/copyright b/ubuntu/_base/applications/ksplash-engine-moodin/debian/copyright
index 087e70775..087e70775 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/copyright
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/copyright
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/dirs b/ubuntu/_base/applications/ksplash-engine-moodin/debian/dirs
index 1ca98e3e2..1ca98e3e2 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/dirs
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/dirs
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/patches/.gitignore b/ubuntu/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules b/ubuntu/_base/applications/ksplash-engine-moodin/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/rules
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/format b/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/format
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/format
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/options b/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/source/options
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/source/options
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/README.debian b/ubuntu/_base/applications/ksquirrel/debian/README.debian
index 5e7bd078a..5e7bd078a 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/README.debian
+++ b/ubuntu/_base/applications/ksquirrel/debian/README.debian
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/changelog b/ubuntu/_base/applications/ksquirrel/debian/changelog
index 8f786a231..8f786a231 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/changelog
+++ b/ubuntu/_base/applications/ksquirrel/debian/changelog
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/compat b/ubuntu/_base/applications/ksquirrel/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/compat
+++ b/ubuntu/_base/applications/ksquirrel/debian/compat
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/control b/ubuntu/_base/applications/ksquirrel/debian/control
index 65380a83e..65380a83e 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/control
+++ b/ubuntu/_base/applications/ksquirrel/debian/control
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/copyright b/ubuntu/_base/applications/ksquirrel/debian/copyright
index d09bb9228..d09bb9228 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/copyright
+++ b/ubuntu/_base/applications/ksquirrel/debian/copyright
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/docs b/ubuntu/_base/applications/ksquirrel/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/docs
+++ b/ubuntu/_base/applications/ksquirrel/debian/docs
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/ksquirrel-libs-configurator.1 b/ubuntu/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
index a6da62b4c..a6da62b4c 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
+++ b/ubuntu/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/patches/.gitignore b/ubuntu/_base/applications/ksquirrel/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/ksquirrel/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/rules b/ubuntu/_base/applications/ksquirrel/debian/rules
index 328283c93..328283c93 100755
--- a/ubuntu/maverick/applications/ksquirrel/debian/rules
+++ b/ubuntu/_base/applications/ksquirrel/debian/rules
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/source/format b/ubuntu/_base/applications/ksquirrel/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/source/format
+++ b/ubuntu/_base/applications/ksquirrel/debian/source/format
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/source/options b/ubuntu/_base/applications/ksquirrel/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/source/options
+++ b/ubuntu/_base/applications/ksquirrel/debian/source/options
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/watch b/ubuntu/_base/applications/ksquirrel/debian/watch
index a276799ff..a276799ff 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/watch
+++ b/ubuntu/_base/applications/ksquirrel/debian/watch
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/README.Debian-source b/ubuntu/_base/applications/kstreamripper/debian/README.Debian-source
index 57547ac25..57547ac25 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/README.Debian-source
+++ b/ubuntu/_base/applications/kstreamripper/debian/README.Debian-source
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/changelog b/ubuntu/_base/applications/kstreamripper/debian/changelog
index 7e7fdb95b..7e7fdb95b 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/changelog
+++ b/ubuntu/_base/applications/kstreamripper/debian/changelog
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/compat b/ubuntu/_base/applications/kstreamripper/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/compat
+++ b/ubuntu/_base/applications/kstreamripper/debian/compat
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/control b/ubuntu/_base/applications/kstreamripper/debian/control
index f66278fd5..f66278fd5 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/control
+++ b/ubuntu/_base/applications/kstreamripper/debian/control
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/copyright b/ubuntu/_base/applications/kstreamripper/debian/copyright
index 61d405298..61d405298 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/copyright
+++ b/ubuntu/_base/applications/kstreamripper/debian/copyright
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/dirs b/ubuntu/_base/applications/kstreamripper/debian/dirs
index a59ccc8af..a59ccc8af 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/dirs
+++ b/ubuntu/_base/applications/kstreamripper/debian/dirs
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/docs b/ubuntu/_base/applications/kstreamripper/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/docs
+++ b/ubuntu/_base/applications/kstreamripper/debian/docs
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper-trinity.install b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.install
index dc292dbda..dc292dbda 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper-trinity.install
+++ b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.install
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper-trinity.postinst b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst
index f5542ab64..f5542ab64 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper-trinity.postinst
+++ b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper-trinity.postrm b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm
index 5209bcb38..5209bcb38 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper-trinity.postrm
+++ b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper.1 b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.1
index 3129be689..3129be689 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper.1
+++ b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.1
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper.desktop b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.desktop
index a0c155fac..a0c155fac 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper.desktop
+++ b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.desktop
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper.menu b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.menu
index f2cfe85c6..f2cfe85c6 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/kstreamripper.menu
+++ b/ubuntu/_base/applications/kstreamripper/debian/kstreamripper.menu
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/rules b/ubuntu/_base/applications/kstreamripper/debian/rules
index 88540f9bf..88540f9bf 100755
--- a/ubuntu/maverick/applications/kstreamripper/debian/rules
+++ b/ubuntu/_base/applications/kstreamripper/debian/rules
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/source/format b/ubuntu/_base/applications/kstreamripper/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/source/format
+++ b/ubuntu/_base/applications/kstreamripper/debian/source/format
diff --git a/ubuntu/maverick/applications/kstreamripper/debian/source/options b/ubuntu/_base/applications/kstreamripper/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kstreamripper/debian/source/options
+++ b/ubuntu/_base/applications/kstreamripper/debian/source/options
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk b/ubuntu/_base/applications/ksystemlog/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/ksystemlog/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/versions.pl b/ubuntu/_base/applications/ksystemlog/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/ksystemlog/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/changelog b/ubuntu/_base/applications/ksystemlog/debian/changelog
index d067e585b..d067e585b 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/changelog
+++ b/ubuntu/_base/applications/ksystemlog/debian/changelog
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/compat b/ubuntu/_base/applications/ksystemlog/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/compat
+++ b/ubuntu/_base/applications/ksystemlog/debian/compat
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/control b/ubuntu/_base/applications/ksystemlog/debian/control
index 704424cf3..704424cf3 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/control
+++ b/ubuntu/_base/applications/ksystemlog/debian/control
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/copyright b/ubuntu/_base/applications/ksystemlog/debian/copyright
index 0aac949f5..0aac949f5 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/copyright
+++ b/ubuntu/_base/applications/ksystemlog/debian/copyright
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/docs b/ubuntu/_base/applications/ksystemlog/debian/docs
index 5502ed8f4..5502ed8f4 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/docs
+++ b/ubuntu/_base/applications/ksystemlog/debian/docs
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/ksystemlog.xml b/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml
index 3261e6bf7..3261e6bf7 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/ksystemlog.xml
+++ b/ubuntu/_base/applications/ksystemlog/debian/ksystemlog.xml
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/menu b/ubuntu/_base/applications/ksystemlog/debian/menu
index 232165cbb..232165cbb 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/menu
+++ b/ubuntu/_base/applications/ksystemlog/debian/menu
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/patches/series b/ubuntu/_base/applications/ksystemlog/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/patches/series
+++ b/ubuntu/_base/applications/ksystemlog/debian/patches/series
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/rules b/ubuntu/_base/applications/ksystemlog/debian/rules
index a9c2c64a6..a9c2c64a6 100755
--- a/ubuntu/maverick/applications/ksystemlog/debian/rules
+++ b/ubuntu/_base/applications/ksystemlog/debian/rules
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/source/format b/ubuntu/_base/applications/ksystemlog/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/source/format
+++ b/ubuntu/_base/applications/ksystemlog/debian/source/format
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/source/options b/ubuntu/_base/applications/ksystemlog/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/source/options
+++ b/ubuntu/_base/applications/ksystemlog/debian/source/options
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/watch b/ubuntu/_base/applications/ksystemlog/debian/watch
index b15cf467b..b15cf467b 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/watch
+++ b/ubuntu/_base/applications/ksystemlog/debian/watch
diff --git a/ubuntu/maverick/applications/ktechlab/debian/changelog b/ubuntu/_base/applications/ktechlab/debian/changelog
index 757702a77..757702a77 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/changelog
+++ b/ubuntu/_base/applications/ktechlab/debian/changelog
diff --git a/ubuntu/maverick/applications/ktechlab/debian/compat b/ubuntu/_base/applications/ktechlab/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/compat
+++ b/ubuntu/_base/applications/ktechlab/debian/compat
diff --git a/ubuntu/maverick/applications/ktechlab/debian/control b/ubuntu/_base/applications/ktechlab/debian/control
index e1586b286..e1586b286 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/control
+++ b/ubuntu/_base/applications/ktechlab/debian/control
diff --git a/ubuntu/maverick/applications/ktechlab/debian/copyright b/ubuntu/_base/applications/ktechlab/debian/copyright
index 5b1af8a2e..5b1af8a2e 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/copyright
+++ b/ubuntu/_base/applications/ktechlab/debian/copyright
diff --git a/ubuntu/maverick/applications/ktechlab/debian/debiandirs b/ubuntu/_base/applications/ktechlab/debian/debiandirs
index f2d481ccf..f2d481ccf 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/debiandirs
+++ b/ubuntu/_base/applications/ktechlab/debian/debiandirs
diff --git a/ubuntu/maverick/applications/ktechlab/debian/docs b/ubuntu/_base/applications/ktechlab/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/docs
+++ b/ubuntu/_base/applications/ktechlab/debian/docs
diff --git a/ubuntu/maverick/applications/ktechlab/debian/ktechlab.1 b/ubuntu/_base/applications/ktechlab/debian/ktechlab.1
index bb49c1dab..bb49c1dab 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/ktechlab.1
+++ b/ubuntu/_base/applications/ktechlab/debian/ktechlab.1
diff --git a/ubuntu/maverick/applications/ktechlab/debian/manpages b/ubuntu/_base/applications/ktechlab/debian/manpages
index ae17eaa94..ae17eaa94 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/manpages
+++ b/ubuntu/_base/applications/ktechlab/debian/manpages
diff --git a/ubuntu/maverick/applications/ktechlab/debian/menu b/ubuntu/_base/applications/ktechlab/debian/menu
index d3828adaf..d3828adaf 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/menu
+++ b/ubuntu/_base/applications/ktechlab/debian/menu
diff --git a/ubuntu/maverick/applications/ktechlab/debian/microbe.1 b/ubuntu/_base/applications/ktechlab/debian/microbe.1
index bbe54c32b..bbe54c32b 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/microbe.1
+++ b/ubuntu/_base/applications/ktechlab/debian/microbe.1
diff --git a/ubuntu/maverick/applications/ktechlab/debian/patches/.gitignore b/ubuntu/_base/applications/ktechlab/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/ktechlab/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/ktechlab/debian/rules b/ubuntu/_base/applications/ktechlab/debian/rules
index 103f921f7..103f921f7 100755
--- a/ubuntu/maverick/applications/ktechlab/debian/rules
+++ b/ubuntu/_base/applications/ktechlab/debian/rules
diff --git a/ubuntu/maverick/applications/ktechlab/debian/source/format b/ubuntu/_base/applications/ktechlab/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/source/format
+++ b/ubuntu/_base/applications/ktechlab/debian/source/format
diff --git a/ubuntu/maverick/applications/ktechlab/debian/source/options b/ubuntu/_base/applications/ktechlab/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/source/options
+++ b/ubuntu/_base/applications/ktechlab/debian/source/options
diff --git a/ubuntu/maverick/applications/ktorrent/debian/README.Debian b/ubuntu/_base/applications/ktorrent/debian/README.Debian
index 0d4e3f758..0d4e3f758 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/README.Debian
+++ b/ubuntu/_base/applications/ktorrent/debian/README.Debian
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index eb7666b8e..eb7666b8e 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk b/ubuntu/_base/applications/ktorrent/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/ktorrent/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/versions.pl b/ubuntu/_base/applications/ktorrent/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/ktorrent/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/ktorrent/debian/changelog b/ubuntu/_base/applications/ktorrent/debian/changelog
index 9050d084e..9050d084e 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/changelog
+++ b/ubuntu/_base/applications/ktorrent/debian/changelog
diff --git a/ubuntu/maverick/applications/ktorrent/debian/compat b/ubuntu/_base/applications/ktorrent/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/compat
+++ b/ubuntu/_base/applications/ktorrent/debian/compat
diff --git a/ubuntu/maverick/applications/ktorrent/debian/control b/ubuntu/_base/applications/ktorrent/debian/control
index 16fb91ea7..16fb91ea7 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/control
+++ b/ubuntu/_base/applications/ktorrent/debian/control
diff --git a/ubuntu/maverick/applications/ktorrent/debian/copyright b/ubuntu/_base/applications/ktorrent/debian/copyright
index 9b8756613..9b8756613 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/copyright
+++ b/ubuntu/_base/applications/ktorrent/debian/copyright
diff --git a/ubuntu/maverick/applications/ktorrent/debian/ktorrent.1.docbook b/ubuntu/_base/applications/ktorrent/debian/ktorrent.1.docbook
index 63a5fa185..63a5fa185 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/ktorrent.1.docbook
+++ b/ubuntu/_base/applications/ktorrent/debian/ktorrent.1.docbook
diff --git a/ubuntu/maverick/applications/ktorrent/debian/patches/series b/ubuntu/_base/applications/ktorrent/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/patches/series
+++ b/ubuntu/_base/applications/ktorrent/debian/patches/series
diff --git a/ubuntu/maverick/applications/ktorrent/debian/rules b/ubuntu/_base/applications/ktorrent/debian/rules
index be4c2be38..be4c2be38 100755
--- a/ubuntu/maverick/applications/ktorrent/debian/rules
+++ b/ubuntu/_base/applications/ktorrent/debian/rules
diff --git a/ubuntu/maverick/applications/ktorrent/debian/source/format b/ubuntu/_base/applications/ktorrent/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/source/format
+++ b/ubuntu/_base/applications/ktorrent/debian/source/format
diff --git a/ubuntu/maverick/applications/ktorrent/debian/source/options b/ubuntu/_base/applications/ktorrent/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/source/options
+++ b/ubuntu/_base/applications/ktorrent/debian/source/options
diff --git a/ubuntu/maverick/applications/ktorrent/debian/watch b/ubuntu/_base/applications/ktorrent/debian/watch
index 0262eb3c5..0262eb3c5 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/watch
+++ b/ubuntu/_base/applications/ktorrent/debian/watch
diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk b/ubuntu/_base/applications/kuickshow/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kuickshow/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/versions.pl b/ubuntu/_base/applications/kuickshow/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kuickshow/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kuickshow/debian/changelog b/ubuntu/_base/applications/kuickshow/debian/changelog
index ae02198d5..ae02198d5 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/changelog
+++ b/ubuntu/_base/applications/kuickshow/debian/changelog
diff --git a/ubuntu/maverick/applications/kuickshow/debian/compat b/ubuntu/_base/applications/kuickshow/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/compat
+++ b/ubuntu/_base/applications/kuickshow/debian/compat
diff --git a/ubuntu/maverick/applications/kuickshow/debian/control b/ubuntu/_base/applications/kuickshow/debian/control
index a6a86935d..a6a86935d 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/control
+++ b/ubuntu/_base/applications/kuickshow/debian/control
diff --git a/ubuntu/maverick/applications/kuickshow/debian/copyright b/ubuntu/_base/applications/kuickshow/debian/copyright
index 2373ec1a7..2373ec1a7 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/copyright
+++ b/ubuntu/_base/applications/kuickshow/debian/copyright
diff --git a/ubuntu/maverick/applications/kuickshow/debian/icons/kuickshow-16.xpm b/ubuntu/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/icons/kuickshow-16.xpm
+++ b/ubuntu/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm
diff --git a/ubuntu/maverick/applications/kuickshow/debian/icons/kuickshow.xpm b/ubuntu/_base/applications/kuickshow/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/icons/kuickshow.xpm
+++ b/ubuntu/_base/applications/kuickshow/debian/icons/kuickshow.xpm
diff --git a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.install b/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.install
index dee09fb33..dee09fb33 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.install
+++ b/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.install
diff --git a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian b/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.lintian
index 89f453cea..89f453cea 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.lintian
+++ b/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.lintian
diff --git a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.manpages b/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.manpages
+++ b/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.manpages
diff --git a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu b/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.menu
index b76eb47d9..b76eb47d9 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/ubuntu/_base/applications/kuickshow/debian/kuickshow-trinity.menu
diff --git a/ubuntu/maverick/applications/kuickshow/debian/man/kuickshow.1 b/ubuntu/_base/applications/kuickshow/debian/man/kuickshow.1
index bf5caf30c..bf5caf30c 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/man/kuickshow.1
+++ b/ubuntu/_base/applications/kuickshow/debian/man/kuickshow.1
diff --git a/ubuntu/maverick/applications/kuickshow/debian/patches/series b/ubuntu/_base/applications/kuickshow/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/patches/series
+++ b/ubuntu/_base/applications/kuickshow/debian/patches/series
diff --git a/ubuntu/maverick/applications/kuickshow/debian/rules b/ubuntu/_base/applications/kuickshow/debian/rules
index dfe527c0c..dfe527c0c 100755
--- a/ubuntu/maverick/applications/kuickshow/debian/rules
+++ b/ubuntu/_base/applications/kuickshow/debian/rules
diff --git a/ubuntu/maverick/applications/kuickshow/debian/source/format b/ubuntu/_base/applications/kuickshow/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/source/format
+++ b/ubuntu/_base/applications/kuickshow/debian/source/format
diff --git a/ubuntu/maverick/applications/kuickshow/debian/source/options b/ubuntu/_base/applications/kuickshow/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/source/options
+++ b/ubuntu/_base/applications/kuickshow/debian/source/options
diff --git a/ubuntu/maverick/applications/kvirc/debian/changelog b/ubuntu/_base/applications/kvirc/debian/changelog
index 7b05eb612..7b05eb612 100644
--- a/ubuntu/maverick/applications/kvirc/debian/changelog
+++ b/ubuntu/_base/applications/kvirc/debian/changelog
diff --git a/ubuntu/maverick/applications/kvirc/debian/compat b/ubuntu/_base/applications/kvirc/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kvirc/debian/compat
+++ b/ubuntu/_base/applications/kvirc/debian/compat
diff --git a/ubuntu/maverick/applications/kvirc/debian/control b/ubuntu/_base/applications/kvirc/debian/control
index fc5acf33a..fc5acf33a 100644
--- a/ubuntu/maverick/applications/kvirc/debian/control
+++ b/ubuntu/_base/applications/kvirc/debian/control
diff --git a/ubuntu/maverick/applications/kvirc/debian/copyright b/ubuntu/_base/applications/kvirc/debian/copyright
index 3f6f5b6e5..3f6f5b6e5 100644
--- a/ubuntu/maverick/applications/kvirc/debian/copyright
+++ b/ubuntu/_base/applications/kvirc/debian/copyright
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.install b/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.install
index 6ba0b5d33..6ba0b5d33 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.install
+++ b/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.install
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.links b/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.links
index 831b763bf..831b763bf 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.links
+++ b/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.links
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst b/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.postinst
index 44593aa4f..44593aa4f 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.postinst
+++ b/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.postinst
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.prerm b/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.prerm
index 411365f32..411365f32 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-data-trinity.prerm
+++ b/ubuntu/_base/applications/kvirc/debian/kvirc-data-trinity.prerm
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity-dev.install b/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.install
index b786fb7ec..b786fb7ec 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity-dev.install
+++ b/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.install
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity-dev.links b/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.links
index 23a8e59b0..23a8e59b0 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity-dev.links
+++ b/ubuntu/_base/applications/kvirc/debian/kvirc-trinity-dev.links
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.install
index 01777294f..01777294f 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install
+++ b/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.install
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.menu b/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.menu
index b35945214..b35945214 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.menu
+++ b/ubuntu/_base/applications/kvirc/debian/kvirc-trinity.menu
diff --git a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity b/ubuntu/_base/applications/kvirc/debian/overrides/kvirc-trinity
index 8fc30d2e1..8fc30d2e1 100644
--- a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity
+++ b/ubuntu/_base/applications/kvirc/debian/overrides/kvirc-trinity
diff --git a/ubuntu/maverick/applications/kvirc/debian/patches/series b/ubuntu/_base/applications/kvirc/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kvirc/debian/patches/series
+++ b/ubuntu/_base/applications/kvirc/debian/patches/series
diff --git a/ubuntu/maverick/applications/kvirc/debian/rules b/ubuntu/_base/applications/kvirc/debian/rules
index 66b12bfe8..66b12bfe8 100755
--- a/ubuntu/maverick/applications/kvirc/debian/rules
+++ b/ubuntu/_base/applications/kvirc/debian/rules
diff --git a/ubuntu/maverick/applications/kvirc/debian/source/format b/ubuntu/_base/applications/kvirc/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kvirc/debian/source/format
+++ b/ubuntu/_base/applications/kvirc/debian/source/format
diff --git a/ubuntu/maverick/applications/kvirc/debian/source/options b/ubuntu/_base/applications/kvirc/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kvirc/debian/source/options
+++ b/ubuntu/_base/applications/kvirc/debian/source/options
diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk b/ubuntu/_base/applications/kvkbd/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kvkbd/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/versions.pl b/ubuntu/_base/applications/kvkbd/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kvkbd/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kvkbd/debian/changelog b/ubuntu/_base/applications/kvkbd/debian/changelog
index 9d94af90e..9d94af90e 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/changelog
+++ b/ubuntu/_base/applications/kvkbd/debian/changelog
diff --git a/ubuntu/maverick/applications/kvkbd/debian/compat b/ubuntu/_base/applications/kvkbd/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/compat
+++ b/ubuntu/_base/applications/kvkbd/debian/compat
diff --git a/ubuntu/maverick/applications/kvkbd/debian/control b/ubuntu/_base/applications/kvkbd/debian/control
index e772a0df2..e772a0df2 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/control
+++ b/ubuntu/_base/applications/kvkbd/debian/control
diff --git a/ubuntu/maverick/applications/kvkbd/debian/copyright b/ubuntu/_base/applications/kvkbd/debian/copyright
index 6b22ad784..6b22ad784 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/copyright
+++ b/ubuntu/_base/applications/kvkbd/debian/copyright
diff --git a/ubuntu/maverick/applications/kvkbd/debian/docs b/ubuntu/_base/applications/kvkbd/debian/docs
index 62deb0497..62deb0497 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/docs
+++ b/ubuntu/_base/applications/kvkbd/debian/docs
diff --git a/ubuntu/maverick/applications/kvkbd/debian/patches/series b/ubuntu/_base/applications/kvkbd/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/patches/series
+++ b/ubuntu/_base/applications/kvkbd/debian/patches/series
diff --git a/ubuntu/maverick/applications/kvkbd/debian/rules b/ubuntu/_base/applications/kvkbd/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kvkbd/debian/rules
+++ b/ubuntu/_base/applications/kvkbd/debian/rules
diff --git a/ubuntu/maverick/applications/kvkbd/debian/source/format b/ubuntu/_base/applications/kvkbd/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/source/format
+++ b/ubuntu/_base/applications/kvkbd/debian/source/format
diff --git a/ubuntu/maverick/applications/kvkbd/debian/source/options b/ubuntu/_base/applications/kvkbd/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/source/options
+++ b/ubuntu/_base/applications/kvkbd/debian/source/options
diff --git a/ubuntu/maverick/applications/kvpnc/debian/README.Debian b/ubuntu/_base/applications/kvpnc/debian/README.Debian
index c34f0fa8b..c34f0fa8b 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/README.Debian
+++ b/ubuntu/_base/applications/kvpnc/debian/README.Debian
diff --git a/ubuntu/maverick/applications/kvpnc/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kvpnc/debian/cdbs/kde.mk b/ubuntu/_base/applications/kvpnc/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kvpnc/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kvpnc/debian/cdbs/versions.pl b/ubuntu/_base/applications/kvpnc/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kvpnc/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kvpnc/debian/changelog b/ubuntu/_base/applications/kvpnc/debian/changelog
index f8be4973c..f8be4973c 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/changelog
+++ b/ubuntu/_base/applications/kvpnc/debian/changelog
diff --git a/ubuntu/maverick/applications/kvpnc/debian/compat b/ubuntu/_base/applications/kvpnc/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/compat
+++ b/ubuntu/_base/applications/kvpnc/debian/compat
diff --git a/ubuntu/maverick/applications/kvpnc/debian/control b/ubuntu/_base/applications/kvpnc/debian/control
index 00e4add6b..00e4add6b 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/control
+++ b/ubuntu/_base/applications/kvpnc/debian/control
diff --git a/ubuntu/maverick/applications/kvpnc/debian/copyright b/ubuntu/_base/applications/kvpnc/debian/copyright
index d6c60aaf4..d6c60aaf4 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/copyright
+++ b/ubuntu/_base/applications/kvpnc/debian/copyright
diff --git a/ubuntu/maverick/applications/kvpnc/debian/docs b/ubuntu/_base/applications/kvpnc/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/docs
+++ b/ubuntu/_base/applications/kvpnc/debian/docs
diff --git a/ubuntu/maverick/applications/kvpnc/debian/menu b/ubuntu/_base/applications/kvpnc/debian/menu
index 2309453a4..2309453a4 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/menu
+++ b/ubuntu/_base/applications/kvpnc/debian/menu
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff b/ubuntu/_base/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
index 711bbff74..711bbff74 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
+++ b/ubuntu/_base/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/_base/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
index 0729793b7..0729793b7 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
+++ b/ubuntu/_base/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/series b/ubuntu/_base/applications/kvpnc/debian/patches/series
index d29c3ca91..d29c3ca91 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/patches/series
+++ b/ubuntu/_base/applications/kvpnc/debian/patches/series
diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/_base/applications/kvpnc/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/kvpnc/debian/rules
+++ b/ubuntu/_base/applications/kvpnc/debian/rules
diff --git a/ubuntu/maverick/applications/kvpnc/debian/source/format b/ubuntu/_base/applications/kvpnc/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/source/format
+++ b/ubuntu/_base/applications/kvpnc/debian/source/format
diff --git a/ubuntu/maverick/applications/kvpnc/debian/source/options b/ubuntu/_base/applications/kvpnc/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/source/options
+++ b/ubuntu/_base/applications/kvpnc/debian/source/options
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/kde.mk b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/versions.pl b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/changelog b/ubuntu/_base/applications/mplayerthumbs/debian/changelog
index 689110a90..689110a90 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/changelog
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/changelog
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/compat b/ubuntu/_base/applications/mplayerthumbs/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/compat
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/compat
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/control b/ubuntu/_base/applications/mplayerthumbs/debian/control
index e737eace5..e737eace5 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/control
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/control
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/copyright b/ubuntu/_base/applications/mplayerthumbs/debian/copyright
index 91b6157cd..91b6157cd 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/copyright
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/copyright
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/docs b/ubuntu/_base/applications/mplayerthumbs/debian/docs
index c17f03764..c17f03764 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/docs
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/docs
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/rules b/ubuntu/_base/applications/mplayerthumbs/debian/rules
index e5c16cf8a..e5c16cf8a 100755
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/rules
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/rules
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/source/format b/ubuntu/_base/applications/mplayerthumbs/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/source/format
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/source/format
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/source/options b/ubuntu/_base/applications/mplayerthumbs/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/source/options
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/source/options
diff --git a/ubuntu/maverick/applications/piklab/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/piklab/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/piklab/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/piklab/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/piklab/debian/cdbs/kde.mk b/ubuntu/_base/applications/piklab/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/piklab/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/piklab/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/piklab/debian/cdbs/versions.pl b/ubuntu/_base/applications/piklab/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/piklab/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/piklab/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/piklab/debian/changelog b/ubuntu/_base/applications/piklab/debian/changelog
index b0f58e45c..b0f58e45c 100644
--- a/ubuntu/maverick/applications/piklab/debian/changelog
+++ b/ubuntu/_base/applications/piklab/debian/changelog
diff --git a/ubuntu/maverick/applications/piklab/debian/compat b/ubuntu/_base/applications/piklab/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/piklab/debian/compat
+++ b/ubuntu/_base/applications/piklab/debian/compat
diff --git a/ubuntu/maverick/applications/piklab/debian/control b/ubuntu/_base/applications/piklab/debian/control
index 491a1391d..491a1391d 100644
--- a/ubuntu/maverick/applications/piklab/debian/control
+++ b/ubuntu/_base/applications/piklab/debian/control
diff --git a/ubuntu/maverick/applications/piklab/debian/copyright b/ubuntu/_base/applications/piklab/debian/copyright
index 3265a28c8..3265a28c8 100644
--- a/ubuntu/maverick/applications/piklab/debian/copyright
+++ b/ubuntu/_base/applications/piklab/debian/copyright
diff --git a/ubuntu/maverick/applications/piklab/debian/docs b/ubuntu/_base/applications/piklab/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/piklab/debian/docs
+++ b/ubuntu/_base/applications/piklab/debian/docs
diff --git a/ubuntu/maverick/applications/piklab/debian/install b/ubuntu/_base/applications/piklab/debian/install
index 4b76727ec..4b76727ec 100644
--- a/ubuntu/maverick/applications/piklab/debian/install
+++ b/ubuntu/_base/applications/piklab/debian/install
diff --git a/ubuntu/maverick/applications/piklab/debian/menu b/ubuntu/_base/applications/piklab/debian/menu
index f1952f59b..f1952f59b 100644
--- a/ubuntu/maverick/applications/piklab/debian/menu
+++ b/ubuntu/_base/applications/piklab/debian/menu
diff --git a/ubuntu/maverick/applications/piklab/debian/patches/series b/ubuntu/_base/applications/piklab/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/piklab/debian/patches/series
+++ b/ubuntu/_base/applications/piklab/debian/patches/series
diff --git a/ubuntu/maverick/applications/piklab/debian/piklab.desktop b/ubuntu/_base/applications/piklab/debian/piklab.desktop
index 41e546d50..41e546d50 100644
--- a/ubuntu/maverick/applications/piklab/debian/piklab.desktop
+++ b/ubuntu/_base/applications/piklab/debian/piklab.desktop
diff --git a/ubuntu/maverick/applications/piklab/debian/piklab.sng b/ubuntu/_base/applications/piklab/debian/piklab.sng
index 4d2aa5902..4d2aa5902 100644
--- a/ubuntu/maverick/applications/piklab/debian/piklab.sng
+++ b/ubuntu/_base/applications/piklab/debian/piklab.sng
diff --git a/ubuntu/maverick/applications/piklab/debian/piklab.xpm b/ubuntu/_base/applications/piklab/debian/piklab.xpm
index 9f7cfe61f..9f7cfe61f 100644
--- a/ubuntu/maverick/applications/piklab/debian/piklab.xpm
+++ b/ubuntu/_base/applications/piklab/debian/piklab.xpm
diff --git a/ubuntu/maverick/applications/piklab/debian/piklab48.xpm b/ubuntu/_base/applications/piklab/debian/piklab48.xpm
index c7819f422..c7819f422 100644
--- a/ubuntu/maverick/applications/piklab/debian/piklab48.xpm
+++ b/ubuntu/_base/applications/piklab/debian/piklab48.xpm
diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/_base/applications/piklab/debian/rules
index f16888762..f16888762 100755
--- a/ubuntu/maverick/applications/piklab/debian/rules
+++ b/ubuntu/_base/applications/piklab/debian/rules
diff --git a/ubuntu/maverick/applications/piklab/debian/source/format b/ubuntu/_base/applications/piklab/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/piklab/debian/source/format
+++ b/ubuntu/_base/applications/piklab/debian/source/format
diff --git a/ubuntu/maverick/applications/piklab/debian/source/options b/ubuntu/_base/applications/piklab/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/piklab/debian/source/options
+++ b/ubuntu/_base/applications/piklab/debian/source/options
diff --git a/ubuntu/maverick/applications/potracegui/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/potracegui/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/potracegui/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/potracegui/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/potracegui/debian/cdbs/kde.mk b/ubuntu/_base/applications/potracegui/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/potracegui/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/potracegui/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/potracegui/debian/cdbs/versions.pl b/ubuntu/_base/applications/potracegui/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/potracegui/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/potracegui/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/potracegui/debian/changelog b/ubuntu/_base/applications/potracegui/debian/changelog
index 87afc2863..87afc2863 100644
--- a/ubuntu/maverick/applications/potracegui/debian/changelog
+++ b/ubuntu/_base/applications/potracegui/debian/changelog
diff --git a/ubuntu/maverick/applications/potracegui/debian/compat b/ubuntu/_base/applications/potracegui/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/potracegui/debian/compat
+++ b/ubuntu/_base/applications/potracegui/debian/compat
diff --git a/ubuntu/maverick/applications/potracegui/debian/control b/ubuntu/_base/applications/potracegui/debian/control
index d3e850cc2..d3e850cc2 100644
--- a/ubuntu/maverick/applications/potracegui/debian/control
+++ b/ubuntu/_base/applications/potracegui/debian/control
diff --git a/ubuntu/maverick/applications/potracegui/debian/copyright b/ubuntu/_base/applications/potracegui/debian/copyright
index f3437d1cc..f3437d1cc 100644
--- a/ubuntu/maverick/applications/potracegui/debian/copyright
+++ b/ubuntu/_base/applications/potracegui/debian/copyright
diff --git a/ubuntu/maverick/applications/potracegui/debian/dirs b/ubuntu/_base/applications/potracegui/debian/dirs
index 34e17c1b8..34e17c1b8 100644
--- a/ubuntu/maverick/applications/potracegui/debian/dirs
+++ b/ubuntu/_base/applications/potracegui/debian/dirs
diff --git a/ubuntu/maverick/applications/potracegui/debian/docs b/ubuntu/_base/applications/potracegui/debian/docs
index ba8894c15..ba8894c15 100644
--- a/ubuntu/maverick/applications/potracegui/debian/docs
+++ b/ubuntu/_base/applications/potracegui/debian/docs
diff --git a/ubuntu/maverick/applications/potracegui/debian/potracegui-trinity.menu b/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.menu
index 04719df19..04719df19 100644
--- a/ubuntu/maverick/applications/potracegui/debian/potracegui-trinity.menu
+++ b/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.menu
diff --git a/ubuntu/maverick/applications/potracegui/debian/rules b/ubuntu/_base/applications/potracegui/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/potracegui/debian/rules
+++ b/ubuntu/_base/applications/potracegui/debian/rules
diff --git a/ubuntu/maverick/applications/potracegui/debian/source/format b/ubuntu/_base/applications/potracegui/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/potracegui/debian/source/format
+++ b/ubuntu/_base/applications/potracegui/debian/source/format
diff --git a/ubuntu/maverick/applications/potracegui/debian/source/options b/ubuntu/_base/applications/potracegui/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/potracegui/debian/source/options
+++ b/ubuntu/_base/applications/potracegui/debian/source/options
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/changelog b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/changelog
index f19f76875..f19f76875 100644
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/changelog
+++ b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/changelog
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/compat b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/compat
+++ b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/compat
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/control b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/control
index 3a5275587..3a5275587 100644
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/control
+++ b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/control
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/copyright b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/copyright
index f9a86f1b0..f9a86f1b0 100644
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/copyright
+++ b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/copyright
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/patches/series b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/patches/series
+++ b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/patches/series
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/rules b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/rules
index 7db927c4b..7db927c4b 100755
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/rules
+++ b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/rules
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/source/format b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/source/format
+++ b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/source/format
diff --git a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/source/options b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/qt4-tqt-theme-engine/debian/source/options
+++ b/ubuntu/_base/applications/qt4-tqt-theme-engine/debian/source/options
diff --git a/ubuntu/maverick/applications/rosegarden/debian/README.Debian b/ubuntu/_base/applications/rosegarden/debian/README.Debian
index 64768c7c2..64768c7c2 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/README.Debian
+++ b/ubuntu/_base/applications/rosegarden/debian/README.Debian
diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk b/ubuntu/_base/applications/rosegarden/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/rosegarden/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl b/ubuntu/_base/applications/rosegarden/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/rosegarden/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/rosegarden/debian/changelog b/ubuntu/_base/applications/rosegarden/debian/changelog
index 0b615fd6e..0b615fd6e 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/changelog
+++ b/ubuntu/_base/applications/rosegarden/debian/changelog
diff --git a/ubuntu/maverick/applications/rosegarden/debian/compat b/ubuntu/_base/applications/rosegarden/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/compat
+++ b/ubuntu/_base/applications/rosegarden/debian/compat
diff --git a/ubuntu/maverick/applications/rosegarden/debian/control b/ubuntu/_base/applications/rosegarden/debian/control
index d5fea643b..d5fea643b 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/control
+++ b/ubuntu/_base/applications/rosegarden/debian/control
diff --git a/ubuntu/maverick/applications/rosegarden/debian/copyright b/ubuntu/_base/applications/rosegarden/debian/copyright
index d86a8816a..d86a8816a 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/copyright
+++ b/ubuntu/_base/applications/rosegarden/debian/copyright
diff --git a/ubuntu/maverick/applications/rosegarden/debian/patches/series b/ubuntu/_base/applications/rosegarden/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/patches/series
+++ b/ubuntu/_base/applications/rosegarden/debian/patches/series
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-audiofile-importer.1 b/ubuntu/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1
index b420ba197..b420ba197 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-audiofile-importer.1
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install b/ubuntu/_base/applications/rosegarden/debian/rosegarden-data-trinity.install
index 59a4a5943..59a4a5943 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-data-trinity.install
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-lilypondview.1 b/ubuntu/_base/applications/rosegarden/debian/rosegarden-lilypondview.1
index e2aa9f951..e2aa9f951 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-lilypondview.1
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-lilypondview.1
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-project-package.1 b/ubuntu/_base/applications/rosegarden/debian/rosegarden-project-package.1
index 0da30c2a5..0da30c2a5 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-project-package.1
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-project-package.1
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.dirs b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.dirs
index 1dffbd19c..1dffbd19c 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.dirs
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.dirs
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.docs b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.docs
index 23da6d676..23da6d676 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.docs
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.docs
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.examples b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.examples
index 1e660fdcf..1e660fdcf 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.examples
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.examples
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.install b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.install
index 50a0bcdaa..50a0bcdaa 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.install
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.install
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.links b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.links
index f3d6d1228..f3d6d1228 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.links
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.links
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.lintian b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.lintian
index 135ea69e9..135ea69e9 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.lintian
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.lintian
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.manpages b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.manpages
index 6e3b96ee0..6e3b96ee0 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.manpages
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.manpages
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.menu b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.menu
index c97a7ce33..c97a7ce33 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.menu
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.menu
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
index 3b3894dec..3b3894dec 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden.1 b/ubuntu/_base/applications/rosegarden/debian/rosegarden.1
index fe750e0b2..fe750e0b2 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden.1
+++ b/ubuntu/_base/applications/rosegarden/debian/rosegarden.1
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rules b/ubuntu/_base/applications/rosegarden/debian/rules
index 4e364d16b..4e364d16b 100755
--- a/ubuntu/maverick/applications/rosegarden/debian/rules
+++ b/ubuntu/_base/applications/rosegarden/debian/rules
diff --git a/ubuntu/maverick/applications/rosegarden/debian/semantic.cache b/ubuntu/_base/applications/rosegarden/debian/semantic.cache
index e7b76d07a..e7b76d07a 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/semantic.cache
+++ b/ubuntu/_base/applications/rosegarden/debian/semantic.cache
diff --git a/ubuntu/maverick/applications/rosegarden/debian/source/format b/ubuntu/_base/applications/rosegarden/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/source/format
+++ b/ubuntu/_base/applications/rosegarden/debian/source/format
diff --git a/ubuntu/maverick/applications/rosegarden/debian/source/options b/ubuntu/_base/applications/rosegarden/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/source/options
+++ b/ubuntu/_base/applications/rosegarden/debian/source/options
diff --git a/ubuntu/maverick/applications/rosegarden/debian/watch b/ubuntu/_base/applications/rosegarden/debian/watch
index f0021dfd7..f0021dfd7 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/watch
+++ b/ubuntu/_base/applications/rosegarden/debian/watch
diff --git a/ubuntu/maverick/applications/rosegarden/debian/x-rosegarden.desktop b/ubuntu/_base/applications/rosegarden/debian/x-rosegarden.desktop
index 97c9b0404..97c9b0404 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/x-rosegarden.desktop
+++ b/ubuntu/_base/applications/rosegarden/debian/x-rosegarden.desktop
diff --git a/ubuntu/maverick/applications/smartcardauth/debian/changelog b/ubuntu/_base/applications/smartcardauth/debian/changelog
index 4d5f37dad..4d5f37dad 100644
--- a/ubuntu/maverick/applications/smartcardauth/debian/changelog
+++ b/ubuntu/_base/applications/smartcardauth/debian/changelog
diff --git a/ubuntu/maverick/applications/smartcardauth/debian/compat b/ubuntu/_base/applications/smartcardauth/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/smartcardauth/debian/compat
+++ b/ubuntu/_base/applications/smartcardauth/debian/compat
diff --git a/ubuntu/maverick/applications/smartcardauth/debian/control b/ubuntu/_base/applications/smartcardauth/debian/control
index bce5bb123..bce5bb123 100644
--- a/ubuntu/maverick/applications/smartcardauth/debian/control
+++ b/ubuntu/_base/applications/smartcardauth/debian/control
diff --git a/ubuntu/maverick/applications/smartcardauth/debian/dirs b/ubuntu/_base/applications/smartcardauth/debian/dirs
index 73752c9ae..73752c9ae 100644
--- a/ubuntu/maverick/applications/smartcardauth/debian/dirs
+++ b/ubuntu/_base/applications/smartcardauth/debian/dirs
diff --git a/ubuntu/maverick/applications/smartcardauth/debian/rules b/ubuntu/_base/applications/smartcardauth/debian/rules
index fb1fa68e3..fb1fa68e3 100755
--- a/ubuntu/maverick/applications/smartcardauth/debian/rules
+++ b/ubuntu/_base/applications/smartcardauth/debian/rules
diff --git a/ubuntu/maverick/applications/smartcardauth/debian/smartcardauth.postinst b/ubuntu/_base/applications/smartcardauth/debian/smartcardauth.postinst
index f9ef17d78..f9ef17d78 100644
--- a/ubuntu/maverick/applications/smartcardauth/debian/smartcardauth.postinst
+++ b/ubuntu/_base/applications/smartcardauth/debian/smartcardauth.postinst
diff --git a/ubuntu/maverick/applications/smartcardauth/debian/source/format b/ubuntu/_base/applications/smartcardauth/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/smartcardauth/debian/source/format
+++ b/ubuntu/_base/applications/smartcardauth/debian/source/format
diff --git a/ubuntu/maverick/applications/smartcardauth/debian/source/options b/ubuntu/_base/applications/smartcardauth/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/smartcardauth/debian/source/options
+++ b/ubuntu/_base/applications/smartcardauth/debian/source/options
diff --git a/ubuntu/maverick/applications/smb4k/debian/README.Debian b/ubuntu/_base/applications/smb4k/debian/README.Debian
index 995d110e5..995d110e5 100644
--- a/ubuntu/maverick/applications/smb4k/debian/README.Debian
+++ b/ubuntu/_base/applications/smb4k/debian/README.Debian
diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/smb4k/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk b/ubuntu/_base/applications/smb4k/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/smb4k/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/versions.pl b/ubuntu/_base/applications/smb4k/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/smb4k/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/smb4k/debian/changelog b/ubuntu/_base/applications/smb4k/debian/changelog
index 4696a2fc8..4696a2fc8 100644
--- a/ubuntu/maverick/applications/smb4k/debian/changelog
+++ b/ubuntu/_base/applications/smb4k/debian/changelog
diff --git a/ubuntu/maverick/applications/smb4k/debian/compat b/ubuntu/_base/applications/smb4k/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/smb4k/debian/compat
+++ b/ubuntu/_base/applications/smb4k/debian/compat
diff --git a/ubuntu/maverick/applications/smb4k/debian/control b/ubuntu/_base/applications/smb4k/debian/control
index 10f607666..10f607666 100644
--- a/ubuntu/maverick/applications/smb4k/debian/control
+++ b/ubuntu/_base/applications/smb4k/debian/control
diff --git a/ubuntu/maverick/applications/smb4k/debian/copyright b/ubuntu/_base/applications/smb4k/debian/copyright
index d32c049ef..d32c049ef 100644
--- a/ubuntu/maverick/applications/smb4k/debian/copyright
+++ b/ubuntu/_base/applications/smb4k/debian/copyright
diff --git a/ubuntu/maverick/applications/smb4k/debian/docs b/ubuntu/_base/applications/smb4k/debian/docs
index e4acf0127..e4acf0127 100644
--- a/ubuntu/maverick/applications/smb4k/debian/docs
+++ b/ubuntu/_base/applications/smb4k/debian/docs
diff --git a/ubuntu/maverick/applications/smb4k/debian/menu b/ubuntu/_base/applications/smb4k/debian/menu
index d1f087abb..d1f087abb 100644
--- a/ubuntu/maverick/applications/smb4k/debian/menu
+++ b/ubuntu/_base/applications/smb4k/debian/menu
diff --git a/ubuntu/maverick/applications/smb4k/debian/rules b/ubuntu/_base/applications/smb4k/debian/rules
index 9c064a1c9..9c064a1c9 100755
--- a/ubuntu/maverick/applications/smb4k/debian/rules
+++ b/ubuntu/_base/applications/smb4k/debian/rules
diff --git a/ubuntu/maverick/applications/smb4k/debian/source/format b/ubuntu/_base/applications/smb4k/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/smb4k/debian/source/format
+++ b/ubuntu/_base/applications/smb4k/debian/source/format
diff --git a/ubuntu/maverick/applications/smb4k/debian/source/options b/ubuntu/_base/applications/smb4k/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/smb4k/debian/source/options
+++ b/ubuntu/_base/applications/smb4k/debian/source/options
diff --git a/ubuntu/maverick/applications/smb4k/debian/watch b/ubuntu/_base/applications/smb4k/debian/watch
index 70154d877..70154d877 100644
--- a/ubuntu/maverick/applications/smb4k/debian/watch
+++ b/ubuntu/_base/applications/smb4k/debian/watch
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/README.Debian b/ubuntu/_base/applications/soundkonverter/debian/README.Debian
index 92fd4c3b5..92fd4c3b5 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/README.Debian
+++ b/ubuntu/_base/applications/soundkonverter/debian/README.Debian
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/_base/applications/soundkonverter/debian/cdbs/kde.mk
index a0f991757..a0f991757 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/soundkonverter/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/versions.pl b/ubuntu/_base/applications/soundkonverter/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/soundkonverter/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/changelog b/ubuntu/_base/applications/soundkonverter/debian/changelog
index 585438bcf..585438bcf 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/changelog
+++ b/ubuntu/_base/applications/soundkonverter/debian/changelog
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/compat b/ubuntu/_base/applications/soundkonverter/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/compat
+++ b/ubuntu/_base/applications/soundkonverter/debian/compat
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/control b/ubuntu/_base/applications/soundkonverter/debian/control
index 8da832aa3..8da832aa3 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/control
+++ b/ubuntu/_base/applications/soundkonverter/debian/control
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/copyright b/ubuntu/_base/applications/soundkonverter/debian/copyright
index 05bf08795..05bf08795 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/copyright
+++ b/ubuntu/_base/applications/soundkonverter/debian/copyright
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/docs b/ubuntu/_base/applications/soundkonverter/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/docs
+++ b/ubuntu/_base/applications/soundkonverter/debian/docs
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/patches/.gitignore b/ubuntu/_base/applications/soundkonverter/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/soundkonverter/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/rules b/ubuntu/_base/applications/soundkonverter/debian/rules
index 12340c8de..12340c8de 100755
--- a/ubuntu/maverick/applications/soundkonverter/debian/rules
+++ b/ubuntu/_base/applications/soundkonverter/debian/rules
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install b/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
index 38b81a194..38b81a194 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
+++ b/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/soundkonverter-trinity.install b/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.install
index fcfaef212..fcfaef212 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/soundkonverter-trinity.install
+++ b/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.install
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides b/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
index 6a12cd7d8..6a12cd7d8 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/source/format b/ubuntu/_base/applications/soundkonverter/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/source/format
+++ b/ubuntu/_base/applications/soundkonverter/debian/source/format
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/source/options b/ubuntu/_base/applications/soundkonverter/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/source/options
+++ b/ubuntu/_base/applications/soundkonverter/debian/source/options
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/README.Debian b/ubuntu/_base/applications/tde-guidance/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/README.Debian
+++ b/ubuntu/_base/applications/tde-guidance/debian/README.Debian
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/changelog b/ubuntu/_base/applications/tde-guidance/debian/changelog
index fb3aec362..fb3aec362 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/changelog
+++ b/ubuntu/_base/applications/tde-guidance/debian/changelog
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/compat b/ubuntu/_base/applications/tde-guidance/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/compat
+++ b/ubuntu/_base/applications/tde-guidance/debian/compat
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/_base/applications/tde-guidance/debian/control
index 668946d8b..668946d8b 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/_base/applications/tde-guidance/debian/control
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/copyright b/ubuntu/_base/applications/tde-guidance/debian/copyright
index d50783096..d50783096 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/copyright
+++ b/ubuntu/_base/applications/tde-guidance/debian/copyright
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/docs b/ubuntu/_base/applications/tde-guidance/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/docs
+++ b/ubuntu/_base/applications/tde-guidance/debian/docs
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/guidance-backends-trinity.install b/ubuntu/_base/applications/tde-guidance/debian/guidance-backends-trinity.install
index d292fc8d3..d292fc8d3 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/guidance-backends-trinity.install
+++ b/ubuntu/_base/applications/tde-guidance/debian/guidance-backends-trinity.install
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/mountconfig-trinity.1 b/ubuntu/_base/applications/tde-guidance/debian/mountconfig-trinity.1
index d3076cc3c..d3076cc3c 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/mountconfig-trinity.1
+++ b/ubuntu/_base/applications/tde-guidance/debian/mountconfig-trinity.1
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/patches/series b/ubuntu/_base/applications/tde-guidance/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/patches/series
+++ b/ubuntu/_base/applications/tde-guidance/debian/patches/series
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/pycompat b/ubuntu/_base/applications/tde-guidance/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/pycompat
+++ b/ubuntu/_base/applications/tde-guidance/debian/pycompat
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/_base/applications/tde-guidance/debian/python-distutils-jaunty.mk
index 1a1ec9a8e..1a1ec9a8e 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/python-distutils-jaunty.mk
+++ b/ubuntu/_base/applications/tde-guidance/debian/python-distutils-jaunty.mk
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/pyversions b/ubuntu/_base/applications/tde-guidance/debian/pyversions
index b3dc41ebc..b3dc41ebc 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/pyversions
+++ b/ubuntu/_base/applications/tde-guidance/debian/pyversions
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/_base/applications/tde-guidance/debian/rules
index 656eac6d4..656eac6d4 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/_base/applications/tde-guidance/debian/rules
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/_base/applications/tde-guidance/debian/serviceconfig-trinity.1
index 8ef180de8..8ef180de8 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/serviceconfig-trinity.1
+++ b/ubuntu/_base/applications/tde-guidance/debian/serviceconfig-trinity.1
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/source/format b/ubuntu/_base/applications/tde-guidance/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/source/format
+++ b/ubuntu/_base/applications/tde-guidance/debian/source/format
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/source/options b/ubuntu/_base/applications/tde-guidance/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/source/options
+++ b/ubuntu/_base/applications/tde-guidance/debian/source/options
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.install
index fe690a9c2..fe690a9c2 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
+++ b/ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.install
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides b/ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
index f151ee69f..f151ee69f 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.postinst b/ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.postinst
index af8e365b5..af8e365b5 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.postinst
+++ b/ubuntu/_base/applications/tde-guidance/debian/tde-guidance-trinity.postinst
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/userconfig-trinity.1 b/ubuntu/_base/applications/tde-guidance/debian/userconfig-trinity.1
index 1fda3dd19..1fda3dd19 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/userconfig-trinity.1
+++ b/ubuntu/_base/applications/tde-guidance/debian/userconfig-trinity.1
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/watch b/ubuntu/_base/applications/tde-guidance/debian/watch
index 19912c171..19912c171 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/watch
+++ b/ubuntu/_base/applications/tde-guidance/debian/watch
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/cdbs/kde.mk b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/cdbs/versions.pl b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog b/ubuntu/_base/applications/tde-style-lipstik/debian/changelog
index 08a7b19ab..08a7b19ab 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/changelog
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/changelog
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/compat b/ubuntu/_base/applications/tde-style-lipstik/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/compat
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/compat
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/control b/ubuntu/_base/applications/tde-style-lipstik/debian/control
index a8cfccb37..a8cfccb37 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/control
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/control
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/copyright b/ubuntu/_base/applications/tde-style-lipstik/debian/copyright
index 446318fca..446318fca 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/copyright
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/copyright
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/docs b/ubuntu/_base/applications/tde-style-lipstik/debian/docs
index 0948b8ef4..0948b8ef4 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/docs
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/docs
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/patches/.gitignore b/ubuntu/_base/applications/tde-style-lipstik/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules b/ubuntu/_base/applications/tde-style-lipstik/debian/rules
index e5c16cf8a..e5c16cf8a 100755
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/rules
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/source/format b/ubuntu/_base/applications/tde-style-lipstik/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/source/format
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/source/format
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/source/options b/ubuntu/_base/applications/tde-style-lipstik/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/source/options
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/source/options
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/versions.pl b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog b/ubuntu/_base/applications/tde-style-qtcurve/debian/changelog
index f7612d81f..f7612d81f 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/changelog
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/changelog
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/compat b/ubuntu/_base/applications/tde-style-qtcurve/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/compat
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/compat
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control b/ubuntu/_base/applications/tde-style-qtcurve/debian/control
index 048385d12..048385d12 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/control
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/control
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/copyright b/ubuntu/_base/applications/tde-style-qtcurve/debian/copyright
index 055d8a659..055d8a659 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/copyright
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/copyright
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/docs b/ubuntu/_base/applications/tde-style-qtcurve/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/docs
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/docs
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/patches/series b/ubuntu/_base/applications/tde-style-qtcurve/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/patches/series
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/patches/series
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules b/ubuntu/_base/applications/tde-style-qtcurve/debian/rules
index d8db5a04b..d8db5a04b 100755
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/rules
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/scan-version b/ubuntu/_base/applications/tde-style-qtcurve/debian/scan-version
index 640ea27c7..640ea27c7 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/scan-version
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/scan-version
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/format b/ubuntu/_base/applications/tde-style-qtcurve/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/format
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/source/format
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/options b/ubuntu/_base/applications/tde-style-qtcurve/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/source/options
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/source/options
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install b/ubuntu/_base/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
index 003761370..003761370 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/versions.pl b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/changelog b/ubuntu/_base/applications/tde-systemsettings/debian/changelog
index 244389e07..244389e07 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/changelog
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/changelog
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/compat b/ubuntu/_base/applications/tde-systemsettings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/compat
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/compat
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/control b/ubuntu/_base/applications/tde-systemsettings/debian/control
index 3a0b8df5e..3a0b8df5e 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/control
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/control
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/copyright b/ubuntu/_base/applications/tde-systemsettings/debian/copyright
index 04a4bdce1..04a4bdce1 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/copyright
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/copyright
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/docs b/ubuntu/_base/applications/tde-systemsettings/debian/docs
index 0eb1e7d11..0eb1e7d11 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/docs
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/docs
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/patches/series b/ubuntu/_base/applications/tde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/patches/series
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/patches/series
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/rules b/ubuntu/_base/applications/tde-systemsettings/debian/rules
index 379cddff1..379cddff1 100755
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/rules
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/rules
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/source/format b/ubuntu/_base/applications/tde-systemsettings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/source/format
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/source/format
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/source/options b/ubuntu/_base/applications/tde-systemsettings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/source/options
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/source/options
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/systemsettings.1.docbook b/ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook
index 33a640918..33a640918 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/systemsettings.1.docbook
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/systemsettings.1.docbook
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/tde-settings-laptops.directory b/ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory
index 687a493c4..687a493c4 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/tde-settings-laptops.directory
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/tde-settings-laptops.directory
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst b/ubuntu/_base/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
index f7b840ea2..f7b840ea2 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/changelog b/ubuntu/_base/applications/tdeio-apt/debian/changelog
index 7be1e282b..7be1e282b 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/changelog
+++ b/ubuntu/_base/applications/tdeio-apt/debian/changelog
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/compat b/ubuntu/_base/applications/tdeio-apt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/compat
+++ b/ubuntu/_base/applications/tdeio-apt/debian/compat
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/control b/ubuntu/_base/applications/tdeio-apt/debian/control
index 94a7b1583..94a7b1583 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/control
+++ b/ubuntu/_base/applications/tdeio-apt/debian/control
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/copyright b/ubuntu/_base/applications/tdeio-apt/debian/copyright
index b461d84ed..b461d84ed 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/copyright
+++ b/ubuntu/_base/applications/tdeio-apt/debian/copyright
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/docs b/ubuntu/_base/applications/tdeio-apt/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/docs
+++ b/ubuntu/_base/applications/tdeio-apt/debian/docs
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/patches/series b/ubuntu/_base/applications/tdeio-apt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/patches/series
+++ b/ubuntu/_base/applications/tdeio-apt/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/rules b/ubuntu/_base/applications/tdeio-apt/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/tdeio-apt/debian/rules
+++ b/ubuntu/_base/applications/tdeio-apt/debian/rules
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/source/format b/ubuntu/_base/applications/tdeio-apt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/source/format
+++ b/ubuntu/_base/applications/tdeio-apt/debian/source/format
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/source/options b/ubuntu/_base/applications/tdeio-apt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/source/options
+++ b/ubuntu/_base/applications/tdeio-apt/debian/source/options
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/changelog b/ubuntu/_base/applications/tdeio-ftps/debian/changelog
index 08c670539..08c670539 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/changelog
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/changelog
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/compat b/ubuntu/_base/applications/tdeio-ftps/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/compat
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/compat
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/control b/ubuntu/_base/applications/tdeio-ftps/debian/control
index ded3d5042..ded3d5042 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/control
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/control
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/copyright b/ubuntu/_base/applications/tdeio-ftps/debian/copyright
index bcb77e6d0..bcb77e6d0 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/copyright
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/copyright
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/docs b/ubuntu/_base/applications/tdeio-ftps/debian/docs
index 6f12db508..6f12db508 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/docs
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/docs
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/rules b/ubuntu/_base/applications/tdeio-ftps/debian/rules
index 4c83c4c6d..4c83c4c6d 100755
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/rules
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/rules
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/source/format b/ubuntu/_base/applications/tdeio-ftps/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/source/format
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/source/format
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/source/options b/ubuntu/_base/applications/tdeio-ftps/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/source/options
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/source/options
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/changelog b/ubuntu/_base/applications/tdeio-locate/debian/changelog
index 1e4ca8525..1e4ca8525 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/changelog
+++ b/ubuntu/_base/applications/tdeio-locate/debian/changelog
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/compat b/ubuntu/_base/applications/tdeio-locate/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/compat
+++ b/ubuntu/_base/applications/tdeio-locate/debian/compat
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/control b/ubuntu/_base/applications/tdeio-locate/debian/control
index 45624544c..45624544c 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/control
+++ b/ubuntu/_base/applications/tdeio-locate/debian/control
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/copyright b/ubuntu/_base/applications/tdeio-locate/debian/copyright
index 17e1fdc15..17e1fdc15 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/copyright
+++ b/ubuntu/_base/applications/tdeio-locate/debian/copyright
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/patches/series b/ubuntu/_base/applications/tdeio-locate/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/patches/series
+++ b/ubuntu/_base/applications/tdeio-locate/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio-locate/debian/rules
index 309dc0d3c..309dc0d3c 100755
--- a/ubuntu/maverick/applications/tdeio-locate/debian/rules
+++ b/ubuntu/_base/applications/tdeio-locate/debian/rules
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/source/format b/ubuntu/_base/applications/tdeio-locate/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/source/format
+++ b/ubuntu/_base/applications/tdeio-locate/debian/source/format
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/source/options b/ubuntu/_base/applications/tdeio-locate/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/source/options
+++ b/ubuntu/_base/applications/tdeio-locate/debian/source/options
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/changelog b/ubuntu/_base/applications/tdeio-sword/debian/changelog
index 1a73990b7..1a73990b7 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/changelog
+++ b/ubuntu/_base/applications/tdeio-sword/debian/changelog
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/compat b/ubuntu/_base/applications/tdeio-sword/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/compat
+++ b/ubuntu/_base/applications/tdeio-sword/debian/compat
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/control b/ubuntu/_base/applications/tdeio-sword/debian/control
index 7e7340fe9..7e7340fe9 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/control
+++ b/ubuntu/_base/applications/tdeio-sword/debian/control
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/copyright b/ubuntu/_base/applications/tdeio-sword/debian/copyright
index ed21e28ca..ed21e28ca 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/copyright
+++ b/ubuntu/_base/applications/tdeio-sword/debian/copyright
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/docs b/ubuntu/_base/applications/tdeio-sword/debian/docs
index c17f03764..c17f03764 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/docs
+++ b/ubuntu/_base/applications/tdeio-sword/debian/docs
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/rules b/ubuntu/_base/applications/tdeio-sword/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/tdeio-sword/debian/rules
+++ b/ubuntu/_base/applications/tdeio-sword/debian/rules
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/source/format b/ubuntu/_base/applications/tdeio-sword/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/source/format
+++ b/ubuntu/_base/applications/tdeio-sword/debian/source/format
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/source/options b/ubuntu/_base/applications/tdeio-sword/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/source/options
+++ b/ubuntu/_base/applications/tdeio-sword/debian/source/options
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/changelog b/ubuntu/_base/applications/tdeio-umountwrapper/debian/changelog
index f33d0b302..f33d0b302 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/changelog
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/changelog
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/compat b/ubuntu/_base/applications/tdeio-umountwrapper/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/compat
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/compat
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control b/ubuntu/_base/applications/tdeio-umountwrapper/debian/control
index ed8a42aae..ed8a42aae 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/control
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/control
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/copyright b/ubuntu/_base/applications/tdeio-umountwrapper/debian/copyright
index 08e471ac6..08e471ac6 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/copyright
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/copyright
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/docs b/ubuntu/_base/applications/tdeio-umountwrapper/debian/docs
index 6f12db508..6f12db508 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/docs
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/docs
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/install b/ubuntu/_base/applications/tdeio-umountwrapper/debian/install
index e9c5b29fb..e9c5b29fb 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/install
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/install
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/media_safelyremove.desktop b/ubuntu/_base/applications/tdeio-umountwrapper/debian/media_safelyremove.desktop
index 38fa25d92..38fa25d92 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/media_safelyremove.desktop
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/media_safelyremove.desktop
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/patches/series b/ubuntu/_base/applications/tdeio-umountwrapper/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/patches/series
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/postrm b/ubuntu/_base/applications/tdeio-umountwrapper/debian/postrm
index 705c5b806..705c5b806 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/postrm
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/postrm
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/preinst b/ubuntu/_base/applications/tdeio-umountwrapper/debian/preinst
index 0b210a270..0b210a270 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/preinst
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/preinst
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules b/ubuntu/_base/applications/tdeio-umountwrapper/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/rules
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/rules
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/source/format b/ubuntu/_base/applications/tdeio-umountwrapper/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/source/format
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/source/format
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/source/options b/ubuntu/_base/applications/tdeio-umountwrapper/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/source/options
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/source/options
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/README.source b/ubuntu/_base/applications/tdenetworkmanager/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/README.source
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/README.source
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
index 2dff59226..2dff59226 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/changelog b/ubuntu/_base/applications/tdenetworkmanager/debian/changelog
index b54d300ab..b54d300ab 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/changelog
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/changelog
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/compat b/ubuntu/_base/applications/tdenetworkmanager/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/compat
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/compat
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/control b/ubuntu/_base/applications/tdenetworkmanager/debian/control
index a25a19e9e..a25a19e9e 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/control
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/control
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/copyright b/ubuntu/_base/applications/tdenetworkmanager/debian/copyright
index 2490de254..2490de254 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/copyright
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/copyright
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/manpages b/ubuntu/_base/applications/tdenetworkmanager/debian/manpages
index 0707d198a..0707d198a 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/manpages
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/manpages
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/menu b/ubuntu/_base/applications/tdenetworkmanager/debian/menu
index 7172f7ae8..7172f7ae8 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/menu
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/menu
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/network-manager-tde.lintian b/ubuntu/_base/applications/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..22bd678da 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/network-manager-tde.lintian
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/network-manager-tde.lintian
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/network-manager-tde.postinst b/ubuntu/_base/applications/tdenetworkmanager/debian/network-manager-tde.postinst
index df7b9dba2..df7b9dba2 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/network-manager-tde.postinst
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/network-manager-tde.postinst
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/patches/series b/ubuntu/_base/applications/tdenetworkmanager/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/patches/series
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/rules b/ubuntu/_base/applications/tdenetworkmanager/debian/rules
index e7a182904..e7a182904 100755
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/rules
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/rules
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/source/format b/ubuntu/_base/applications/tdenetworkmanager/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/source/format
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/source/format
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/source/options b/ubuntu/_base/applications/tdenetworkmanager/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/source/options
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/source/options
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/tdenetworkmanager.1 b/ubuntu/_base/applications/tdenetworkmanager/debian/tdenetworkmanager.1
index 0f1abef05..0f1abef05 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/tdenetworkmanager.1
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/tdenetworkmanager.1
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/acpi-support/policy-funcs b/ubuntu/_base/applications/tdepowersave/debian/acpi-support/policy-funcs
index 8b9f13762..8b9f13762 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/acpi-support/policy-funcs
+++ b/ubuntu/_base/applications/tdepowersave/debian/acpi-support/policy-funcs
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdepowersave/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdepowersave/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdepowersave/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdepowersave/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/changelog b/ubuntu/_base/applications/tdepowersave/debian/changelog
index 66a1994bc..66a1994bc 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/changelog
+++ b/ubuntu/_base/applications/tdepowersave/debian/changelog
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/compat b/ubuntu/_base/applications/tdepowersave/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/compat
+++ b/ubuntu/_base/applications/tdepowersave/debian/compat
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/control b/ubuntu/_base/applications/tdepowersave/debian/control
index cfe98ef2b..cfe98ef2b 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/control
+++ b/ubuntu/_base/applications/tdepowersave/debian/control
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/copyright b/ubuntu/_base/applications/tdepowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/copyright
+++ b/ubuntu/_base/applications/tdepowersave/debian/copyright
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/install b/ubuntu/_base/applications/tdepowersave/debian/install
index a07d0d86c..a07d0d86c 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/install
+++ b/ubuntu/_base/applications/tdepowersave/debian/install
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/manpages b/ubuntu/_base/applications/tdepowersave/debian/manpages
index aff0f8470..aff0f8470 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/manpages
+++ b/ubuntu/_base/applications/tdepowersave/debian/manpages
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/menu b/ubuntu/_base/applications/tdepowersave/debian/menu
index 0a4ee7ee2..0a4ee7ee2 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/menu
+++ b/ubuntu/_base/applications/tdepowersave/debian/menu
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/patches/series b/ubuntu/_base/applications/tdepowersave/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/patches/series
+++ b/ubuntu/_base/applications/tdepowersave/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/postrm b/ubuntu/_base/applications/tdepowersave/debian/postrm
index 951550174..951550174 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/postrm
+++ b/ubuntu/_base/applications/tdepowersave/debian/postrm
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/preinst b/ubuntu/_base/applications/tdepowersave/debian/preinst
index baf2826fc..baf2826fc 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/preinst
+++ b/ubuntu/_base/applications/tdepowersave/debian/preinst
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/rules b/ubuntu/_base/applications/tdepowersave/debian/rules
index 5d637ac86..5d637ac86 100755
--- a/ubuntu/maverick/applications/tdepowersave/debian/rules
+++ b/ubuntu/_base/applications/tdepowersave/debian/rules
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/source/format b/ubuntu/_base/applications/tdepowersave/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/source/format
+++ b/ubuntu/_base/applications/tdepowersave/debian/source/format
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/source/options b/ubuntu/_base/applications/tdepowersave/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/source/options
+++ b/ubuntu/_base/applications/tdepowersave/debian/source/options
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.linda
index ff5153632..ff5153632 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda
+++ b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.linda
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.lintian
index e27c64261..e27c64261 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian
+++ b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.lintian
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.postinst b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.postinst
index a00246bd9..a00246bd9 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.postinst
+++ b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave-trinity.postinst
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1 b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave.1
index d79cfd21d..d79cfd21d 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1
+++ b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave.1
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave.xpm
index a7b0f2e7c..a7b0f2e7c 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm
+++ b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave.xpm
diff --git a/ubuntu/maverick/applications/tderadio/debian/changelog b/ubuntu/_base/applications/tderadio/debian/changelog
index da92952c4..da92952c4 100644
--- a/ubuntu/maverick/applications/tderadio/debian/changelog
+++ b/ubuntu/_base/applications/tderadio/debian/changelog
diff --git a/ubuntu/maverick/applications/tderadio/debian/compat b/ubuntu/_base/applications/tderadio/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tderadio/debian/compat
+++ b/ubuntu/_base/applications/tderadio/debian/compat
diff --git a/ubuntu/maverick/applications/tderadio/debian/control b/ubuntu/_base/applications/tderadio/debian/control
index 34cf676d9..34cf676d9 100644
--- a/ubuntu/maverick/applications/tderadio/debian/control
+++ b/ubuntu/_base/applications/tderadio/debian/control
diff --git a/ubuntu/maverick/applications/tderadio/debian/convert-presets.1 b/ubuntu/_base/applications/tderadio/debian/convert-presets.1
index 0a96aa40e..0a96aa40e 100644
--- a/ubuntu/maverick/applications/tderadio/debian/convert-presets.1
+++ b/ubuntu/_base/applications/tderadio/debian/convert-presets.1
diff --git a/ubuntu/maverick/applications/tderadio/debian/copyright b/ubuntu/_base/applications/tderadio/debian/copyright
index 365f66795..365f66795 100644
--- a/ubuntu/maverick/applications/tderadio/debian/copyright
+++ b/ubuntu/_base/applications/tderadio/debian/copyright
diff --git a/ubuntu/maverick/applications/tderadio/debian/docs b/ubuntu/_base/applications/tderadio/debian/docs
index 0ecc1e4f1..0ecc1e4f1 100644
--- a/ubuntu/maverick/applications/tderadio/debian/docs
+++ b/ubuntu/_base/applications/tderadio/debian/docs
diff --git a/ubuntu/maverick/applications/tderadio/debian/manpages b/ubuntu/_base/applications/tderadio/debian/manpages
index 4760e939e..4760e939e 100644
--- a/ubuntu/maverick/applications/tderadio/debian/manpages
+++ b/ubuntu/_base/applications/tderadio/debian/manpages
diff --git a/ubuntu/maverick/applications/tderadio/debian/menu b/ubuntu/_base/applications/tderadio/debian/menu
index a81c3fdbd..a81c3fdbd 100644
--- a/ubuntu/maverick/applications/tderadio/debian/menu
+++ b/ubuntu/_base/applications/tderadio/debian/menu
diff --git a/ubuntu/maverick/applications/tderadio/debian/rules b/ubuntu/_base/applications/tderadio/debian/rules
index 0dca2b923..0dca2b923 100755
--- a/ubuntu/maverick/applications/tderadio/debian/rules
+++ b/ubuntu/_base/applications/tderadio/debian/rules
diff --git a/ubuntu/maverick/applications/tderadio/debian/source/format b/ubuntu/_base/applications/tderadio/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tderadio/debian/source/format
+++ b/ubuntu/_base/applications/tderadio/debian/source/format
diff --git a/ubuntu/maverick/applications/tderadio/debian/source/options b/ubuntu/_base/applications/tderadio/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tderadio/debian/source/options
+++ b/ubuntu/_base/applications/tderadio/debian/source/options
diff --git a/ubuntu/maverick/applications/tderadio/debian/tderadio.1 b/ubuntu/_base/applications/tderadio/debian/tderadio.1
index 2648970c2..2648970c2 100644
--- a/ubuntu/maverick/applications/tderadio/debian/tderadio.1
+++ b/ubuntu/_base/applications/tderadio/debian/tderadio.1
diff --git a/ubuntu/maverick/applications/tderadio/debian/watch b/ubuntu/_base/applications/tderadio/debian/watch
index 033fb78b0..033fb78b0 100644
--- a/ubuntu/maverick/applications/tderadio/debian/watch
+++ b/ubuntu/_base/applications/tderadio/debian/watch
diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdesudo/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdesudo/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdesudo/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdesudo/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdesudo/debian/changelog b/ubuntu/_base/applications/tdesudo/debian/changelog
index 636573beb..636573beb 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/changelog
+++ b/ubuntu/_base/applications/tdesudo/debian/changelog
diff --git a/ubuntu/maverick/applications/tdesudo/debian/compat b/ubuntu/_base/applications/tdesudo/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/compat
+++ b/ubuntu/_base/applications/tdesudo/debian/compat
diff --git a/ubuntu/maverick/applications/tdesudo/debian/control b/ubuntu/_base/applications/tdesudo/debian/control
index fa506bda9..fa506bda9 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/control
+++ b/ubuntu/_base/applications/tdesudo/debian/control
diff --git a/ubuntu/maverick/applications/tdesudo/debian/copyright b/ubuntu/_base/applications/tdesudo/debian/copyright
index ee75c3d6d..ee75c3d6d 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/copyright
+++ b/ubuntu/_base/applications/tdesudo/debian/copyright
diff --git a/ubuntu/maverick/applications/tdesudo/debian/docs b/ubuntu/_base/applications/tdesudo/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/docs
+++ b/ubuntu/_base/applications/tdesudo/debian/docs
diff --git a/ubuntu/maverick/applications/tdesudo/debian/links b/ubuntu/_base/applications/tdesudo/debian/links
index faf8013c3..faf8013c3 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/links
+++ b/ubuntu/_base/applications/tdesudo/debian/links
diff --git a/ubuntu/maverick/applications/tdesudo/debian/patches/series b/ubuntu/_base/applications/tdesudo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/patches/series
+++ b/ubuntu/_base/applications/tdesudo/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdesudo/debian/postinst b/ubuntu/_base/applications/tdesudo/debian/postinst
index fae49d5b1..fae49d5b1 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/postinst
+++ b/ubuntu/_base/applications/tdesudo/debian/postinst
diff --git a/ubuntu/maverick/applications/tdesudo/debian/postrm b/ubuntu/_base/applications/tdesudo/debian/postrm
index af192c06b..af192c06b 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/postrm
+++ b/ubuntu/_base/applications/tdesudo/debian/postrm
diff --git a/ubuntu/maverick/applications/tdesudo/debian/preinst b/ubuntu/_base/applications/tdesudo/debian/preinst
index cb6630fa0..cb6630fa0 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/preinst
+++ b/ubuntu/_base/applications/tdesudo/debian/preinst
diff --git a/ubuntu/maverick/applications/tdesudo/debian/rules b/ubuntu/_base/applications/tdesudo/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/tdesudo/debian/rules
+++ b/ubuntu/_base/applications/tdesudo/debian/rules
diff --git a/ubuntu/maverick/applications/tdesudo/debian/source/format b/ubuntu/_base/applications/tdesudo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/source/format
+++ b/ubuntu/_base/applications/tdesudo/debian/source/format
diff --git a/ubuntu/maverick/applications/tdesudo/debian/source/options b/ubuntu/_base/applications/tdesudo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/source/options
+++ b/ubuntu/_base/applications/tdesudo/debian/source/options
diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdesvn/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdesvn/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdesvn/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdesvn/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdesvn/debian/changelog b/ubuntu/_base/applications/tdesvn/debian/changelog
index b1c057b0b..b1c057b0b 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/changelog
+++ b/ubuntu/_base/applications/tdesvn/debian/changelog
diff --git a/ubuntu/maverick/applications/tdesvn/debian/compat b/ubuntu/_base/applications/tdesvn/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/compat
+++ b/ubuntu/_base/applications/tdesvn/debian/compat
diff --git a/ubuntu/maverick/applications/tdesvn/debian/control b/ubuntu/_base/applications/tdesvn/debian/control
index 2e98dc13c..2e98dc13c 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/control
+++ b/ubuntu/_base/applications/tdesvn/debian/control
diff --git a/ubuntu/maverick/applications/tdesvn/debian/copyright b/ubuntu/_base/applications/tdesvn/debian/copyright
index 74f00ccfd..74f00ccfd 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/copyright
+++ b/ubuntu/_base/applications/tdesvn/debian/copyright
diff --git a/ubuntu/maverick/applications/tdesvn/debian/docs b/ubuntu/_base/applications/tdesvn/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/docs
+++ b/ubuntu/_base/applications/tdesvn/debian/docs
diff --git a/ubuntu/maverick/applications/tdesvn/debian/icons/tdesvn.xpm b/ubuntu/_base/applications/tdesvn/debian/icons/tdesvn.xpm
index 38da00075..38da00075 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/icons/tdesvn.xpm
+++ b/ubuntu/_base/applications/tdesvn/debian/icons/tdesvn.xpm
diff --git a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install b/ubuntu/_base/applications/tdesvn/debian/libsvnqt-trinity-dev.install
index 14b087527..14b087527 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt-trinity-dev.install
+++ b/ubuntu/_base/applications/tdesvn/debian/libsvnqt-trinity-dev.install
diff --git a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt4-trinity.install b/ubuntu/_base/applications/tdesvn/debian/libsvnqt4-trinity.install
index fcfe51754..fcfe51754 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/libsvnqt4-trinity.install
+++ b/ubuntu/_base/applications/tdesvn/debian/libsvnqt4-trinity.install
diff --git a/ubuntu/maverick/applications/tdesvn/debian/man/tdesvn.1 b/ubuntu/_base/applications/tdesvn/debian/man/tdesvn.1
index 7a4db503b..7a4db503b 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/man/tdesvn.1
+++ b/ubuntu/_base/applications/tdesvn/debian/man/tdesvn.1
diff --git a/ubuntu/maverick/applications/tdesvn/debian/man/tdesvnaskpass.1 b/ubuntu/_base/applications/tdesvn/debian/man/tdesvnaskpass.1
index e19bcaf04..e19bcaf04 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/man/tdesvnaskpass.1
+++ b/ubuntu/_base/applications/tdesvn/debian/man/tdesvnaskpass.1
diff --git a/ubuntu/maverick/applications/tdesvn/debian/patches/series b/ubuntu/_base/applications/tdesvn/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/patches/series
+++ b/ubuntu/_base/applications/tdesvn/debian/patches/series
diff --git a/ubuntu/maverick/applications/tdesvn/debian/rules b/ubuntu/_base/applications/tdesvn/debian/rules
index ca472273e..ca472273e 100755
--- a/ubuntu/maverick/applications/tdesvn/debian/rules
+++ b/ubuntu/_base/applications/tdesvn/debian/rules
diff --git a/ubuntu/maverick/applications/tdesvn/debian/source/format b/ubuntu/_base/applications/tdesvn/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/source/format
+++ b/ubuntu/_base/applications/tdesvn/debian/source/format
diff --git a/ubuntu/maverick/applications/tdesvn/debian/source/options b/ubuntu/_base/applications/tdesvn/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/source/options
+++ b/ubuntu/_base/applications/tdesvn/debian/source/options
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install b/ubuntu/_base/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
index 79f9eff3d..79f9eff3d 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/applications/tdesvn/debian/tdesvn-tdeio-plugins-trinity.install
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install b/ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.install
index 8903355a2..8903355a2 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.install
+++ b/ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.install
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.manpages b/ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.manpages
index 8cb778203..8cb778203 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.manpages
+++ b/ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.manpages
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu b/ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.menu
index 5d045b145..5d045b145 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/ubuntu/_base/applications/tdesvn/debian/tdesvn-trinity.menu
diff --git a/ubuntu/maverick/applications/tdesvn/debian/watch b/ubuntu/_base/applications/tdesvn/debian/watch
index 80c0f090c..80c0f090c 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/watch
+++ b/ubuntu/_base/applications/tdesvn/debian/watch
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/README.Debian b/ubuntu/_base/applications/tdmtheme/debian/README.Debian
index cf18ccb66..cf18ccb66 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/README.Debian
+++ b/ubuntu/_base/applications/tdmtheme/debian/README.Debian
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/_base/applications/tdmtheme/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tdmtheme/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdmtheme/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tdmtheme/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/changelog b/ubuntu/_base/applications/tdmtheme/debian/changelog
index d57a5b4e6..d57a5b4e6 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/changelog
+++ b/ubuntu/_base/applications/tdmtheme/debian/changelog
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/compat b/ubuntu/_base/applications/tdmtheme/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/compat
+++ b/ubuntu/_base/applications/tdmtheme/debian/compat
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/control b/ubuntu/_base/applications/tdmtheme/debian/control
index 831ff7a59..831ff7a59 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/control
+++ b/ubuntu/_base/applications/tdmtheme/debian/control
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/copyright b/ubuntu/_base/applications/tdmtheme/debian/copyright
index c8d6d972f..c8d6d972f 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/copyright
+++ b/ubuntu/_base/applications/tdmtheme/debian/copyright
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/docs b/ubuntu/_base/applications/tdmtheme/debian/docs
index 6f12db508..6f12db508 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/docs
+++ b/ubuntu/_base/applications/tdmtheme/debian/docs
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/patches/.gitignore b/ubuntu/_base/applications/tdmtheme/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/tdmtheme/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/rules b/ubuntu/_base/applications/tdmtheme/debian/rules
index 18b1c07e2..18b1c07e2 100755
--- a/ubuntu/maverick/applications/tdmtheme/debian/rules
+++ b/ubuntu/_base/applications/tdmtheme/debian/rules
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/source/format b/ubuntu/_base/applications/tdmtheme/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/source/format
+++ b/ubuntu/_base/applications/tdmtheme/debian/source/format
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/source/options b/ubuntu/_base/applications/tdmtheme/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/source/options
+++ b/ubuntu/_base/applications/tdmtheme/debian/source/options
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/tdmtheme-trinity.lintian b/ubuntu/_base/applications/tdmtheme/debian/tdmtheme-trinity.lintian
index f1c2df0c2..f1c2df0c2 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/tdmtheme-trinity.lintian
+++ b/ubuntu/_base/applications/tdmtheme/debian/tdmtheme-trinity.lintian
diff --git a/ubuntu/maverick/applications/tellico/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tellico/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/tellico/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tellico/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tellico/debian/cdbs/kde.mk b/ubuntu/_base/applications/tellico/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/tellico/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tellico/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tellico/debian/cdbs/versions.pl b/ubuntu/_base/applications/tellico/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tellico/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tellico/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tellico/debian/changelog b/ubuntu/_base/applications/tellico/debian/changelog
index 3739f1ebb..3739f1ebb 100644
--- a/ubuntu/maverick/applications/tellico/debian/changelog
+++ b/ubuntu/_base/applications/tellico/debian/changelog
diff --git a/ubuntu/maverick/applications/tellico/debian/compat b/ubuntu/_base/applications/tellico/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tellico/debian/compat
+++ b/ubuntu/_base/applications/tellico/debian/compat
diff --git a/ubuntu/maverick/applications/tellico/debian/control b/ubuntu/_base/applications/tellico/debian/control
index fc3c025bc..fc3c025bc 100644
--- a/ubuntu/maverick/applications/tellico/debian/control
+++ b/ubuntu/_base/applications/tellico/debian/control
diff --git a/ubuntu/maverick/applications/tellico/debian/copyright b/ubuntu/_base/applications/tellico/debian/copyright
index 69496b35c..69496b35c 100644
--- a/ubuntu/maverick/applications/tellico/debian/copyright
+++ b/ubuntu/_base/applications/tellico/debian/copyright
diff --git a/ubuntu/maverick/applications/tellico/debian/menu b/ubuntu/_base/applications/tellico/debian/menu
index f0572cf58..f0572cf58 100644
--- a/ubuntu/maverick/applications/tellico/debian/menu
+++ b/ubuntu/_base/applications/tellico/debian/menu
diff --git a/ubuntu/maverick/applications/tellico/debian/rules b/ubuntu/_base/applications/tellico/debian/rules
index 3e267ae9b..3e267ae9b 100755
--- a/ubuntu/maverick/applications/tellico/debian/rules
+++ b/ubuntu/_base/applications/tellico/debian/rules
diff --git a/ubuntu/maverick/applications/tellico/debian/source/format b/ubuntu/_base/applications/tellico/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tellico/debian/source/format
+++ b/ubuntu/_base/applications/tellico/debian/source/format
diff --git a/ubuntu/maverick/applications/tellico/debian/source/options b/ubuntu/_base/applications/tellico/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tellico/debian/source/options
+++ b/ubuntu/_base/applications/tellico/debian/source/options
diff --git a/ubuntu/maverick/applications/tellico/debian/tellico-data-trinity.install b/ubuntu/_base/applications/tellico/debian/tellico-data-trinity.install
index 71150d6de..71150d6de 100644
--- a/ubuntu/maverick/applications/tellico/debian/tellico-data-trinity.install
+++ b/ubuntu/_base/applications/tellico/debian/tellico-data-trinity.install
diff --git a/ubuntu/maverick/applications/tellico/debian/tellico-scripts-trinity.install b/ubuntu/_base/applications/tellico/debian/tellico-scripts-trinity.install
index 71c51d5eb..71c51d5eb 100644
--- a/ubuntu/maverick/applications/tellico/debian/tellico-scripts-trinity.install
+++ b/ubuntu/_base/applications/tellico/debian/tellico-scripts-trinity.install
diff --git a/ubuntu/maverick/applications/tellico/debian/tellico-trinity.install b/ubuntu/_base/applications/tellico/debian/tellico-trinity.install
index a45d88c99..a45d88c99 100644
--- a/ubuntu/maverick/applications/tellico/debian/tellico-trinity.install
+++ b/ubuntu/_base/applications/tellico/debian/tellico-trinity.install
diff --git a/ubuntu/maverick/applications/tellico/debian/tellico-trinity.manpages b/ubuntu/_base/applications/tellico/debian/tellico-trinity.manpages
index 68831ac30..68831ac30 100644
--- a/ubuntu/maverick/applications/tellico/debian/tellico-trinity.manpages
+++ b/ubuntu/_base/applications/tellico/debian/tellico-trinity.manpages
diff --git a/ubuntu/maverick/applications/tellico/debian/tellico.1x b/ubuntu/_base/applications/tellico/debian/tellico.1x
index 29a569a0b..29a569a0b 100644
--- a/ubuntu/maverick/applications/tellico/debian/tellico.1x
+++ b/ubuntu/_base/applications/tellico/debian/tellico.1x
diff --git a/ubuntu/maverick/applications/tellico/debian/tellico.xpm b/ubuntu/_base/applications/tellico/debian/tellico.xpm
index 589d66eeb..589d66eeb 100644
--- a/ubuntu/maverick/applications/tellico/debian/tellico.xpm
+++ b/ubuntu/_base/applications/tellico/debian/tellico.xpm
diff --git a/ubuntu/maverick/applications/tellico/debian/watch b/ubuntu/_base/applications/tellico/debian/watch
index 8e67307f5..8e67307f5 100644
--- a/ubuntu/maverick/applications/tellico/debian/watch
+++ b/ubuntu/_base/applications/tellico/debian/watch
diff --git a/ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/tork/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/tork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/tork/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tork/debian/cdbs/kde.mk b/ubuntu/_base/applications/tork/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/tork/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/tork/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/tork/debian/cdbs/versions.pl b/ubuntu/_base/applications/tork/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/tork/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/tork/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/tork/debian/changelog b/ubuntu/_base/applications/tork/debian/changelog
index 3b95e00b3..3b95e00b3 100644
--- a/ubuntu/maverick/applications/tork/debian/changelog
+++ b/ubuntu/_base/applications/tork/debian/changelog
diff --git a/ubuntu/maverick/applications/tork/debian/compat b/ubuntu/_base/applications/tork/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/tork/debian/compat
+++ b/ubuntu/_base/applications/tork/debian/compat
diff --git a/ubuntu/maverick/applications/tork/debian/control b/ubuntu/_base/applications/tork/debian/control
index d9ef4f5ab..d9ef4f5ab 100644
--- a/ubuntu/maverick/applications/tork/debian/control
+++ b/ubuntu/_base/applications/tork/debian/control
diff --git a/ubuntu/maverick/applications/tork/debian/copyright b/ubuntu/_base/applications/tork/debian/copyright
index 898d738e9..898d738e9 100644
--- a/ubuntu/maverick/applications/tork/debian/copyright
+++ b/ubuntu/_base/applications/tork/debian/copyright
diff --git a/ubuntu/maverick/applications/tork/debian/rules b/ubuntu/_base/applications/tork/debian/rules
index 36fed7dc5..36fed7dc5 100755
--- a/ubuntu/maverick/applications/tork/debian/rules
+++ b/ubuntu/_base/applications/tork/debian/rules
diff --git a/ubuntu/maverick/applications/tork/debian/source/format b/ubuntu/_base/applications/tork/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/tork/debian/source/format
+++ b/ubuntu/_base/applications/tork/debian/source/format
diff --git a/ubuntu/maverick/applications/tork/debian/source/options b/ubuntu/_base/applications/tork/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/tork/debian/source/options
+++ b/ubuntu/_base/applications/tork/debian/source/options
diff --git a/ubuntu/maverick/applications/tork/debian/tork-data-trinity.install b/ubuntu/_base/applications/tork/debian/tork-data-trinity.install
index cde21cb0e..cde21cb0e 100644
--- a/ubuntu/maverick/applications/tork/debian/tork-data-trinity.install
+++ b/ubuntu/_base/applications/tork/debian/tork-data-trinity.install
diff --git a/ubuntu/maverick/applications/tork/debian/tork-trinity.install b/ubuntu/_base/applications/tork/debian/tork-trinity.install
index ff343137a..ff343137a 100644
--- a/ubuntu/maverick/applications/tork/debian/tork-trinity.install
+++ b/ubuntu/_base/applications/tork/debian/tork-trinity.install
diff --git a/ubuntu/maverick/applications/tork/debian/tork-trinity.postinst b/ubuntu/_base/applications/tork/debian/tork-trinity.postinst
index f2b7c5c96..f2b7c5c96 100644
--- a/ubuntu/maverick/applications/tork/debian/tork-trinity.postinst
+++ b/ubuntu/_base/applications/tork/debian/tork-trinity.postinst
diff --git a/ubuntu/maverick/applications/tork/debian/tork-trinity.postrm b/ubuntu/_base/applications/tork/debian/tork-trinity.postrm
index f2b7c5c96..f2b7c5c96 100644
--- a/ubuntu/maverick/applications/tork/debian/tork-trinity.postrm
+++ b/ubuntu/_base/applications/tork/debian/tork-trinity.postrm
diff --git a/ubuntu/maverick/applications/tork/debian/watch b/ubuntu/_base/applications/tork/debian/watch
index 94d0d842f..94d0d842f 100644
--- a/ubuntu/maverick/applications/tork/debian/watch
+++ b/ubuntu/_base/applications/tork/debian/watch
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/versions.pl b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/changelog b/ubuntu/_base/applications/twin-style-crystal/debian/changelog
index 9b64574f4..9b64574f4 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/changelog
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/changelog
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/compat b/ubuntu/_base/applications/twin-style-crystal/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/compat
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/compat
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/control b/ubuntu/_base/applications/twin-style-crystal/debian/control
index a32f9e3e2..a32f9e3e2 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/control
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/control
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/copyright b/ubuntu/_base/applications/twin-style-crystal/debian/copyright
index dbb28c22d..dbb28c22d 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/copyright
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/copyright
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/dirs b/ubuntu/_base/applications/twin-style-crystal/debian/dirs
index 5bdbb8a8d..5bdbb8a8d 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/dirs
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/dirs
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/docs b/ubuntu/_base/applications/twin-style-crystal/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/docs
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/docs
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/patches/series b/ubuntu/_base/applications/twin-style-crystal/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/patches/series
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/patches/series
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/rules b/ubuntu/_base/applications/twin-style-crystal/debian/rules
index 43eb62819..43eb62819 100755
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/rules
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/rules
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/source/format b/ubuntu/_base/applications/twin-style-crystal/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/source/format
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/source/format
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/source/options b/ubuntu/_base/applications/twin-style-crystal/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/source/options
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/source/options
diff --git a/ubuntu/maverick/applications/wlassistant/debian/README.Debian b/ubuntu/_base/applications/wlassistant/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/README.Debian
+++ b/ubuntu/_base/applications/wlassistant/debian/README.Debian
diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk b/ubuntu/_base/applications/wlassistant/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/wlassistant/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl b/ubuntu/_base/applications/wlassistant/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/wlassistant/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/wlassistant/debian/changelog b/ubuntu/_base/applications/wlassistant/debian/changelog
index 5eed797ea..5eed797ea 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/changelog
+++ b/ubuntu/_base/applications/wlassistant/debian/changelog
diff --git a/ubuntu/maverick/applications/wlassistant/debian/compat b/ubuntu/_base/applications/wlassistant/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/compat
+++ b/ubuntu/_base/applications/wlassistant/debian/compat
diff --git a/ubuntu/maverick/applications/wlassistant/debian/control b/ubuntu/_base/applications/wlassistant/debian/control
index b7bd04cb6..b7bd04cb6 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/control
+++ b/ubuntu/_base/applications/wlassistant/debian/control
diff --git a/ubuntu/maverick/applications/wlassistant/debian/copyright b/ubuntu/_base/applications/wlassistant/debian/copyright
index 5179772ff..5179772ff 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/copyright
+++ b/ubuntu/_base/applications/wlassistant/debian/copyright
diff --git a/ubuntu/maverick/applications/wlassistant/debian/patches/series b/ubuntu/_base/applications/wlassistant/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/patches/series
+++ b/ubuntu/_base/applications/wlassistant/debian/patches/series
diff --git a/ubuntu/maverick/applications/wlassistant/debian/rules b/ubuntu/_base/applications/wlassistant/debian/rules
index 13db5ab65..13db5ab65 100755
--- a/ubuntu/maverick/applications/wlassistant/debian/rules
+++ b/ubuntu/_base/applications/wlassistant/debian/rules
diff --git a/ubuntu/maverick/applications/wlassistant/debian/source/format b/ubuntu/_base/applications/wlassistant/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/source/format
+++ b/ubuntu/_base/applications/wlassistant/debian/source/format
diff --git a/ubuntu/maverick/applications/wlassistant/debian/source/options b/ubuntu/_base/applications/wlassistant/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/source/options
+++ b/ubuntu/_base/applications/wlassistant/debian/source/options
diff --git a/ubuntu/maverick/applications/wlassistant/debian/watch b/ubuntu/_base/applications/wlassistant/debian/watch
index 42304de6e..42304de6e 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/watch
+++ b/ubuntu/_base/applications/wlassistant/debian/watch
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-16.xpm b/ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm
index fcaa89b00..fcaa89b00 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-16.xpm
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-16.xpm
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.dirs b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
index 110a71185..110a71185 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.dirs
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.docs b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs
index 8fa4b0c87..8fa4b0c87 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.docs
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.docs
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.install b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install
index 7465386d3..7465386d3 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.install
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.install
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.manpage b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
index 28b6283c0..28b6283c0 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.manpage
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu
index 9e7286512..9e7286512 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant-trinity.menu
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant.xpm b/ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm
index d1f52cbe8..d1f52cbe8 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant.xpm
+++ b/ubuntu/_base/applications/wlassistant/debian/wlassistant.xpm
diff --git a/ubuntu/maverick/applications/yakuake/debian/README b/ubuntu/_base/applications/yakuake/debian/README
index 5738af4de..5738af4de 100644
--- a/ubuntu/maverick/applications/yakuake/debian/README
+++ b/ubuntu/_base/applications/yakuake/debian/README
diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/yakuake/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk b/ubuntu/_base/applications/yakuake/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/yakuake/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/versions.pl b/ubuntu/_base/applications/yakuake/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/yakuake/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/yakuake/debian/changelog b/ubuntu/_base/applications/yakuake/debian/changelog
index fcb60a3f9..fcb60a3f9 100644
--- a/ubuntu/maverick/applications/yakuake/debian/changelog
+++ b/ubuntu/_base/applications/yakuake/debian/changelog
diff --git a/ubuntu/maverick/applications/yakuake/debian/compat b/ubuntu/_base/applications/yakuake/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/yakuake/debian/compat
+++ b/ubuntu/_base/applications/yakuake/debian/compat
diff --git a/ubuntu/maverick/applications/yakuake/debian/control b/ubuntu/_base/applications/yakuake/debian/control
index 353801d04..353801d04 100644
--- a/ubuntu/maverick/applications/yakuake/debian/control
+++ b/ubuntu/_base/applications/yakuake/debian/control
diff --git a/ubuntu/maverick/applications/yakuake/debian/copyright b/ubuntu/_base/applications/yakuake/debian/copyright
index df27b9653..df27b9653 100644
--- a/ubuntu/maverick/applications/yakuake/debian/copyright
+++ b/ubuntu/_base/applications/yakuake/debian/copyright
diff --git a/ubuntu/maverick/applications/yakuake/debian/docs b/ubuntu/_base/applications/yakuake/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/maverick/applications/yakuake/debian/docs
+++ b/ubuntu/_base/applications/yakuake/debian/docs
diff --git a/ubuntu/maverick/applications/yakuake/debian/icons/yakuake-16.xpm b/ubuntu/_base/applications/yakuake/debian/icons/yakuake-16.xpm
index a16b98fef..a16b98fef 100644
--- a/ubuntu/maverick/applications/yakuake/debian/icons/yakuake-16.xpm
+++ b/ubuntu/_base/applications/yakuake/debian/icons/yakuake-16.xpm
diff --git a/ubuntu/maverick/applications/yakuake/debian/icons/yakuake.xpm b/ubuntu/_base/applications/yakuake/debian/icons/yakuake.xpm
index 6745c7c0e..6745c7c0e 100644
--- a/ubuntu/maverick/applications/yakuake/debian/icons/yakuake.xpm
+++ b/ubuntu/_base/applications/yakuake/debian/icons/yakuake.xpm
diff --git a/ubuntu/maverick/applications/yakuake/debian/patches/.gitignore b/ubuntu/_base/applications/yakuake/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/yakuake/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/yakuake/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/yakuake/debian/rules b/ubuntu/_base/applications/yakuake/debian/rules
index 4c83c4c6d..4c83c4c6d 100755
--- a/ubuntu/maverick/applications/yakuake/debian/rules
+++ b/ubuntu/_base/applications/yakuake/debian/rules
diff --git a/ubuntu/maverick/applications/yakuake/debian/source/format b/ubuntu/_base/applications/yakuake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/yakuake/debian/source/format
+++ b/ubuntu/_base/applications/yakuake/debian/source/format
diff --git a/ubuntu/maverick/applications/yakuake/debian/source/options b/ubuntu/_base/applications/yakuake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/yakuake/debian/source/options
+++ b/ubuntu/_base/applications/yakuake/debian/source/options
diff --git a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.install b/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.install
index e5e863463..e5e863463 100644
--- a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.install
+++ b/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.install
diff --git a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.menu b/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.menu
index 782658df2..782658df2 100644
--- a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.menu
+++ b/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.menu
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/Makefile b/ubuntu/_base/defaultsettings/desktop-base/Makefile
index 6552ca238..6552ca238 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/Makefile
+++ b/ubuntu/_base/defaultsettings/desktop-base/Makefile
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png
index b545a70b5..b545a70b5 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
index 342510f15..342510f15 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
index 668819dff..668819dff 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png
index f87aa89e6..f87aa89e6 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
index ce1826b7f..ce1826b7f 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png
index f1cc99099..f1cc99099 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2 b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
index 574c298c2..574c298c2 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
index d79d09dba..d79d09dba 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
index 71d1fe759..71d1fe759 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
index 8908e000c..8908e000c 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
index 622087d7f..622087d7f 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png
index 9ce61a7e8..9ce61a7e8 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2 b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
index 2222bac6b..2222bac6b 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
+++ b/ubuntu/_base/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian-desktop-logo.png b/ubuntu/_base/defaultsettings/desktop-base/debian-desktop-logo.png
index b1e768aef..b1e768aef 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian-desktop-logo.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian-desktop-logo.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian-homepage.desktop b/ubuntu/_base/defaultsettings/desktop-base/debian-homepage.desktop
index 384bd14fe..384bd14fe 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian-homepage.desktop
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian-homepage.desktop
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian-reference.desktop b/ubuntu/_base/defaultsettings/desktop-base/debian-reference.desktop
index 36a7992e4..36a7992e4 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian-reference.desktop
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian-reference.desktop
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian-security.desktop b/ubuntu/_base/defaultsettings/desktop-base/debian-security.desktop
index 43d6a1e42..43d6a1e42 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian-security.desktop
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian-security.desktop
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/README.Debian b/ubuntu/_base/defaultsettings/desktop-base/debian/README.Debian
index 260c6fb02..260c6fb02 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/README.Debian
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/README.Debian
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/changelog b/ubuntu/_base/defaultsettings/desktop-base/debian/changelog
index c09beb592..c09beb592 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/changelog
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/changelog
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/compat b/ubuntu/_base/defaultsettings/desktop-base/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/compat
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/compat
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/control b/ubuntu/_base/defaultsettings/desktop-base/debian/control
index a81d6d913..a81d6d913 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/control
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/control
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/copyright b/ubuntu/_base/defaultsettings/desktop-base/debian/copyright
index 990146cb7..990146cb7 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/copyright
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/copyright
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/.gitignore b/ubuntu/_base/defaultsettings/desktop-base/debian/distrospecific/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/distrospecific/.gitignore
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/distrospecific/.gitignore
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/gconf-defaults b/ubuntu/_base/defaultsettings/desktop-base/debian/gconf-defaults
index 10e4b8297..10e4b8297 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/gconf-defaults
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/gconf-defaults
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/postinst b/ubuntu/_base/defaultsettings/desktop-base/debian/postinst
index 94a22d5b4..94a22d5b4 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/postinst
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/postinst
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/postrm b/ubuntu/_base/defaultsettings/desktop-base/debian/postrm
index 864bf9e6a..864bf9e6a 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/postrm
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/postrm
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/preinst b/ubuntu/_base/defaultsettings/desktop-base/debian/preinst
index d46d14701..d46d14701 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/preinst
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/preinst
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/prerm b/ubuntu/_base/defaultsettings/desktop-base/debian/prerm
index bf67f87d8..bf67f87d8 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/prerm
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/prerm
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/rules b/ubuntu/_base/defaultsettings/desktop-base/debian/rules
index 67ba1f7f8..67ba1f7f8 100755
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/rules
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/rules
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/source.lintian-overrides b/ubuntu/_base/defaultsettings/desktop-base/debian/source.lintian-overrides
index cebc8b1f3..cebc8b1f3 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/source.lintian-overrides
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/source/format b/ubuntu/_base/defaultsettings/desktop-base/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/source/format
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/source/format
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/source/include-binaries b/ubuntu/_base/defaultsettings/desktop-base/debian/source/include-binaries
index d98a28417..d98a28417 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/source/include-binaries
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/source/include-binaries
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/source/options b/ubuntu/_base/defaultsettings/desktop-base/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/source/options
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/source/options
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst b/ubuntu/_base/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst
index 8b26fd83c..8b26fd83c 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm b/ubuntu/_base/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm
index 079dfdd2b..079dfdd2b 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm
+++ b/ubuntu/_base/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.icon b/ubuntu/_base/defaultsettings/desktop-base/emblems/emblem-debian.icon
index 2fbbb0a5b..2fbbb0a5b 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.icon
+++ b/ubuntu/_base/defaultsettings/desktop-base/emblems/emblem-debian.icon
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.png b/ubuntu/_base/defaultsettings/desktop-base/emblems/emblem-debian.png
index 4927922cc..4927922cc 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/emblems/emblem-debian.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/emblems/emblem-debian.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/gnome-backgrounds.xml b/ubuntu/_base/defaultsettings/desktop-base/gnome-backgrounds.xml
index 9391aa82e..9391aa82e 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/gnome-backgrounds.xml
+++ b/ubuntu/_base/defaultsettings/desktop-base/gnome-backgrounds.xml
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/kompmgr-rc-files/compton-tde.conf b/ubuntu/_base/defaultsettings/desktop-base/kompmgr-rc-files/compton-tde.conf
index 26c725969..26c725969 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/kompmgr-rc-files/compton-tde.conf
+++ b/ubuntu/_base/defaultsettings/desktop-base/kompmgr-rc-files/compton-tde.conf
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/kompmgr-rc-files/xcompmgrrc b/ubuntu/_base/defaultsettings/desktop-base/kompmgr-rc-files/xcompmgrrc
index 9c9b9ff17..9c9b9ff17 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/kompmgr-rc-files/xcompmgrrc
+++ b/ubuntu/_base/defaultsettings/desktop-base/kompmgr-rc-files/xcompmgrrc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
index e582ab8c0..e582ab8c0 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
index bc20c1153..bc20c1153 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
index 0572ce2eb..0572ce2eb 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
index 954cbae6f..954cbae6f 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
index fe09df872..fe09df872 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
index cc3e4ae43..cc3e4ae43 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
index d518fd78b..d518fd78b 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
index 7b3cba641..7b3cba641 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
index 9017a337b..9017a337b 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
index 86ed5f470..86ed5f470 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
index fadcb633f..fadcb633f 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
index bd9d372d2..bd9d372d2 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
index 430cf5263..430cf5263 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
index c62f5372b..c62f5372b 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
index aef8079f3..aef8079f3 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
index 8680cc018..8680cc018 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
index ac8dd37d3..ac8dd37d3 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
index 51d1fca48..51d1fca48 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
index 90e503689..90e503689 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png
index 8183df8e3..8183df8e3 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
index 2a947a8f5..2a947a8f5 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2 b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
index 4c842babd..4c842babd 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
index d12e12ad8..d12e12ad8 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
index d2fe82b23..d2fe82b23 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
index b4443a4d2..b4443a4d2 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png
index 7fb403585..7fb403585 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png
index a2f883e59..a2f883e59 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png
index 4ce019d78..4ce019d78 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png
index 26811fce2..26811fce2 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png
index ed5b3438c..ed5b3438c 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png
index dd4220d28..dd4220d28 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png
index 40f348c81..40f348c81 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png
index f76c71bc4..f76c71bc4 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png
index 800e1d284..800e1d284 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png
index 4b318ce83..4b318ce83 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
index 377c9108e..377c9108e 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png
index 9ce61a7e8..9ce61a7e8 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2 b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
index e633691ca..e633691ca 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
+++ b/ubuntu/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.png b/ubuntu/_base/defaultsettings/desktop-base/pixmaps/debian-security.png
index 672ceca49..672ceca49 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/pixmaps/debian-security.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.xcf b/ubuntu/_base/defaultsettings/desktop-base/pixmaps/debian-security.xcf
index e806fcd2c..e806fcd2c 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/pixmaps/debian-security.xcf
+++ b/ubuntu/_base/defaultsettings/desktop-base/pixmaps/debian-security.xcf
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc
index 9aa289c7e..9aa289c7e 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/share/config/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc
index 8bfbc19d1..8bfbc19d1 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc
+++ b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/share/config/ksplashrc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/twinrc b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/share/config/twinrc
index b3301f1db..b3301f1db 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/share/config/twinrc
+++ b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/share/config/twinrc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals
index 507fde04d..507fde04d 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals
+++ b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/tdeglobals
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc
index 2db7e8c45..2db7e8c45 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc
+++ b/ubuntu/_base/defaultsettings/desktop-base/profiles/tde-profile/tdm/backgroundrc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc b/ubuntu/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
index 9dcd0663c..9dcd0663c 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
+++ b/ubuntu/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc b/ubuntu/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
index fee4fd455..fee4fd455 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
+++ b/ubuntu/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml b/ubuntu/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
index a1e4ea3ea..a1e4ea3ea 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
+++ b/ubuntu/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png b/ubuntu/_base/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png
index 790b7ee75..790b7ee75 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz b/ubuntu/_base/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
index e4e3157d4..e4e3157d4 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
+++ b/ubuntu/_base/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-splash-curves.png b/ubuntu/_base/defaultsettings/desktop-base/splash/gnome-splash-curves.png
index 98342bd13..98342bd13 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splash/gnome-splash-curves.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/splash/gnome-splash-curves.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png b/ubuntu/_base/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png
index 54302fdb3..54302fdb3 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2 b/ubuntu/_base/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
index 979bd5063..979bd5063 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
+++ b/ubuntu/_base/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.png b/ubuntu/_base/defaultsettings/desktop-base/splash/nightly-splash.png
index f9dc212b5..f9dc212b5 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/splash/nightly-splash.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2 b/ubuntu/_base/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2
index bb8c73087..bb8c73087 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2
+++ b/ubuntu/_base/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf b/ubuntu/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
index 58cd6b5e6..58cd6b5e6 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
+++ b/ubuntu/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png b/ubuntu/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png
index 233bcc116..233bcc116 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png b/ubuntu/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png
index e65a562ce..e65a562ce 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml b/ubuntu/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
index ece58c6df..ece58c6df 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
+++ b/ubuntu/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
index b2a3511af..b2a3511af 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
index 336b3d1ab..336b3d1ab 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/KdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg
index 4bed799ac..4bed799ac 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/background.svg
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png
index 3ed8404dc..3ed8404dc 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/boundingbox.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml
index 703e0d0f2..703e0d0f2 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/debian-moreblue.xml
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png
index 6373e018d..6373e018d 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-reboot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png
index ac7843ced..ac7843ced 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/icon-session.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png
index fc3e9982c..fc3e9982c 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/screenshot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg
index afdf212e3..afdf212e3 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/debian-moreblue/swirl.svg
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
index b4e9fb6d9..b4e9fb6d9 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
index 4b90c02ab..4b90c02ab 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png
index 69916901f..69916901f 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg
index b72c3b2f4..b72c3b2f4 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/background.svg
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png
index a09afa171..a09afa171 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/boundingbox.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png
index 6373e018d..6373e018d 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-reboot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png
index ac7843ced..ac7843ced 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/icon-session.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml
index 2d1234bcd..2d1234bcd 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/moreblue-orbit.xml
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png
index d8a494dbf..d8a494dbf 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/moreblue-orbit/screenshot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop
index 7e64bfcc0..7e64bfcc0 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop
index 2eae79097..2eae79097 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/KdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png
index 41aba5d88..41aba5d88 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/Sessions.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png
index a1f0345ed..a1f0345ed 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/Sessions_inactive.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/System.png
index 240c2d9b5..240c2d9b5 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/System.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png
index 4bea4e785..4bea4e785 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/System_inactive.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/background.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/background.png
index e7a091ee7..e7a091ee7 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/background.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/background.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png
index 223b74725..223b74725 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/boundingbox.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml
index 22c6c1bd8..22c6c1bd8 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/nightly.xml
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png
index cf5236829..cf5236829 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/nightly/screenshot.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base
index 280a58042..280a58042 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base
+++ b/ubuntu/_base/defaultsettings/desktop-base/tdm-theme/tdm.d/10_desktop-base
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
index 6f677f506..6f677f506 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
+++ b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
index d60e2ed74..d60e2ed74 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
+++ b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif
index ac8c4b80a..ac8c4b80a 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif
+++ b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png
index de57c529f..de57c529f 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png
+++ b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
index 59632522e..59632522e 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
+++ b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
index ae8c4dd26..ae8c4dd26 100644
--- a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
+++ b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
diff --git a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
index 81f0bd882..81f0bd882 100755
--- a/ubuntu/maverick/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
+++ b/ubuntu/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile b/ubuntu/_base/defaultsettings/kubuntu-default-settings/Makefile
index 21080b3cd..21080b3cd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/Makefile
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdeglobals b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdeglobals
index 9c975c1cd..9c975c1cd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdeglobals
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdesktoprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
index d169791dc..d169791dc 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kickerrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kickerrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/konquerorrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/konquerorrc
index 8a3b98da1..8a3b98da1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/konquerorrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/konquerorrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/ksmserverrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
index 9f757e982..9f757e982 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kwinrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kwinrc
index 3f17db0cc..3f17db0cc 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kwinrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/kwinrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
index f23049399..f23049399 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kaccessrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kaccessrc
index 30b66b640..30b66b640 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kaccessrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kaccessrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kcminputrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kcminputrc
index da0aed512..da0aed512 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kcminputrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kcminputrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kickerrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kickerrc
index 30780e137..30780e137 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kickerrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/ksmserverrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
index db7d79686..db7d79686 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kvkbdrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
index e87700ebf..e87700ebf 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdeglobals b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdeglobals
index d636dd0c4..d636dd0c4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdeglobals
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdesktoprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
index ac89fb28a..ac89fb28a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kickerrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kickerrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/konquerorrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/konquerorrc
index 516543fbe..516543fbe 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/konquerorrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/konquerorrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kwinrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kwinrc
index 6a82a4eb1..6a82a4eb1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kwinrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/moderate-visual-impairment/kwinrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
index 82767e58c..82767e58c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
index 067e50c3f..067e50c3f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/background.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/amarok/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/background.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/amarok/background.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/head.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/amarok/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/head.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/amarok/head.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/stylesheet.css b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/amarok/stylesheet.css
index 6bf2ded5c..6bf2ded5c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/amarok/stylesheet.css
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/amarok/stylesheet.css
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/edgyWallpaper.tar.gz b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/edgyWallpaper.tar.gz
index f100041c8..f100041c8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/edgyWallpaper.tar.gz
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/edgyWallpaper.tar.gz
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1024x768.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1024x768.jpg
index 59160bb19..59160bb19 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x1024.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x1024.jpg
index 4e2bce26e..4e2bce26e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x800.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x800.jpg
index 68815abac..68815abac 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1440x900.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1440x900.jpg
index 3e44742a4..3e44742a4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1600x1200.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1600x1200.jpg
index f6166c447..f6166c447 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1080.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1080.jpg
index 8902b4dfa..8902b4dfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1080.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1080.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1200.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1200.jpg
index be7e79b60..be7e79b60 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/intrepid_wallpapers/Air/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/index.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/index.desktop
index 4159027ea..4159027ea 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/index.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/index.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_admin.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_admin.png
index 89120c90f..89120c90f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_admin.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_admin.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_away.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_away.png
index 897801f62..897801f62 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_away.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_away.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_halfop.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_halfop.png
index c6189edf6..c6189edf6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_halfop.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_halfop.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_normal.png
index 813f8d70e..813f8d70e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_op.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_op.png
index 1667de67e..1667de67e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_op.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_op.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_owner.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_owner.png
index 7df96f8c9..7df96f8c9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_owner.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_owner.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_voice.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_voice.png
index e4f9f41a5..e4f9f41a5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_voice.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/konversation/irc_voice.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/Dialog.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/Dialog.png
index 84a8c8a13..84a8c8a13 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/Dialog.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/Preview.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/Preview.png
index 09655c689..09655c689 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/Preview.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/Preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/ReadMe.txt b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
index 47b686406..47b686406 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/ReadMe.txt
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/Theme.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/Theme.rc
index 913cbfbe8..913cbfbe8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/Theme.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/Theme.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/gpl.txt b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/ksplash/gpl.txt
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/ksplash/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-hardy-wallpaper.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
index a42ebde69..a42ebde69 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
index 052defc97..052defc97 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
index be7e79b60..be7e79b60 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-kmenu-side-tile.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-kmenu-side-tile.png
index 220310005..220310005 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-kmenu-side-tile.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-kmenu-side-tile.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-kmenu-side.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-kmenu-side.png
index 84cc1343e..84cc1343e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-kmenu-side.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-kmenu-side.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-konqueror-background-classic.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-konqueror-background-classic.png
index f11dfa17b..f11dfa17b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-konqueror-background-classic.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-konqueror-background-classic.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-konqueror-background.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-konqueror-background.png
index 5be2c9e2a..5be2c9e2a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-konqueror-background.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-konqueror-background.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-login.ogg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-login.ogg
index 349c13f15..349c13f15 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-login.ogg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-login.ogg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-panel.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-panel.png
index 8f01995da..8f01995da 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-panel.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-panel.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-wallpaper.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-wallpaper.png
index 5edd07e8b..5edd07e8b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-wallpaper.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-wallpaper.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-wallpaper.png.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-wallpaper.png.desktop
index 8ace65f4f..8ace65f4f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kubuntu-wallpaper.png.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kubuntu-wallpaper.png.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/metabar/background.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/metabar/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/metabar/background.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/metabar/background.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/metabar/default.css b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/metabar/default.css
index c8da33422..c8da33422 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/metabar/default.css
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/metabar/default.css
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/metabar/head.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/metabar/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/metabar/head.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/metabar/head.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/metabar/layout.html b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/metabar/layout.html
index 92669de64..92669de64 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/metabar/layout.html
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/metabar/layout.html
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/Dialog.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/Dialog.png
index 3e4862941..3e4862941 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/Dialog.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
index d8fbd800f..d8fbd800f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/gpl.txt b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/gpl.txt
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml
index e6b628f3c..e6b628f3c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/preview.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/preview.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon-no-userlist/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/Dialog.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/Dialog.png
index bd4437f97..bd4437f97 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/Dialog.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
index 085ef86b7..085ef86b7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/gpl.txt b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/gpl.txt
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
index 5d1c437da..5d1c437da 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/preview.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/preview.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme-cartoon/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/Dialog.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/Dialog.png
index 440bf6f43..440bf6f43 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/Dialog.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
index 10ce5cc52..10ce5cc52 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/Makefile.am b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/Makefile.am
index 078e370a5..078e370a5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/Makefile.am
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/Makefile.am
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
index cf8aecd32..cf8aecd32 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/enterprise.xml
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/gpl.txt b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/gpl.txt
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/preview.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/preview.png
index f7712d7d2..f7712d7d2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/preview.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0001.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0001.png
index 2511fe958..2511fe958 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0002.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0002.png
index 437dbb652..437dbb652 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0003.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0003.png
index 757a84acd..757a84acd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0004.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0004.png
index f50f9fb9c..f50f9fb9c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0005.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0005.png
index 5b2838708..5b2838708 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0006.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0006.png
index f9f09e15f..f9f09e15f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0007.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0007.png
index 71a89d7b8..71a89d7b8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0008.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0008.png
index 2ada75115..2ada75115 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0009.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0009.png
index 57dabb733..57dabb733 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0010.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0010.png
index 1f9e457d9..1f9e457d9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0011.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0011.png
index a184e2a81..a184e2a81 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0012.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0012.png
index 7bebbe7b1..7bebbe7b1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0013.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0013.png
index 7062df661..7062df661 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0014.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0014.png
index 8ff603dcd..8ff603dcd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0015.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0015.png
index 84cd48dd9..84cd48dd9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0016.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0016.png
index 0e07dfcff..0e07dfcff 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0017.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0017.png
index ef20e4107..ef20e4107 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0018.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0018.png
index 10ac1f14f..10ac1f14f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0019.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0019.png
index 3dbca061e..3dbca061e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0020.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0020.png
index d5bcca606..d5bcca606 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0021.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0021.png
index fe8dfe828..fe8dfe828 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0022.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0022.png
index 309d39506..309d39506 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0023.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0023.png
index 45f493385..45f493385 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0024.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0024.png
index 3b1f4b62b..3b1f4b62b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0025.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0025.png
index 2a7569bb9..2a7569bb9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0026.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0026.png
index 60a2d9a4b..60a2d9a4b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0027.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0027.png
index 57d8ddf90..57d8ddf90 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0028.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0028.png
index 07f6f6442..07f6f6442 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0029.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0029.png
index 1a7f87398..1a7f87398 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0030.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0030.png
index db3700633..db3700633 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0031.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0031.png
index 5bc157309..5bc157309 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0032.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0032.png
index 5ba70fe7e..5ba70fe7e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0033.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0033.png
index a97437d41..a97437d41 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0034.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0034.png
index 363bb34bc..363bb34bc 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0035.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0035.png
index 971bf0547..971bf0547 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0036.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0036.png
index f3c0b17d4..f3c0b17d4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0037.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0037.png
index c305d3548..c305d3548 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0038.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0038.png
index ea578703e..ea578703e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0039.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0039.png
index 4c9888fc1..4c9888fc1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0040.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0040.png
index 0b753ff8d..0b753ff8d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0041.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0041.png
index 706f08d66..706f08d66 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0042.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0042.png
index 776ef28ce..776ef28ce 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0043.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0043.png
index 381e49bbf..381e49bbf 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0044.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0044.png
index 6e7eeb9e4..6e7eeb9e4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0045.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0045.png
index 4ba9a2d8d..4ba9a2d8d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0046.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0046.png
index d1e7fc959..d1e7fc959 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0047.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0047.png
index ceffb05ac..ceffb05ac 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0048.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0048.png
index bf0dd17e9..bf0dd17e9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0049.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0049.png
index 1eed36bcd..1eed36bcd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0050.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0050.png
index 6537b166c..6537b166c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0051.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0051.png
index 95e75617b..95e75617b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0052.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0052.png
index 5fbb023b6..5fbb023b6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0053.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0053.png
index 187639e22..187639e22 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0054.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0054.png
index f4fde2f12..f4fde2f12 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0055.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0055.png
index 8b1d48c4b..8b1d48c4b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0056.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0056.png
index bfe7141fa..bfe7141fa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0057.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0057.png
index c16c862d6..c16c862d6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0058.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0058.png
index 00755b7f8..00755b7f8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0059.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0059.png
index 58d49bf28..58d49bf28 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0060.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0060.png
index 6f29bb960..6f29bb960 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0061.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0061.png
index 399da3623..399da3623 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0062.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0062.png
index 3901d3fa3..3901d3fa3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0063.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0063.png
index 146f4d92a..146f4d92a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0064.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0064.png
index f624dfad7..f624dfad7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0065.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0065.png
index 80d9750a8..80d9750a8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0066.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0066.png
index 6862242fa..6862242fa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0067.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0067.png
index 21969eadd..21969eadd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0068.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0068.png
index 93450476f..93450476f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0069.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0069.png
index 8d82bd420..8d82bd420 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0070.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0070.png
index 9c952753f..9c952753f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0071.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0071.png
index afe03e426..afe03e426 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0072.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0072.png
index c5898d2f5..c5898d2f5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/trinity.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/trinity.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0001.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0001.png
index 4cc0e63d7..4cc0e63d7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0002.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0002.png
index 47ffe7f5c..47ffe7f5c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0003.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0003.png
index 9c430f17c..9c430f17c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0004.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0004.png
index ce1b601d3..ce1b601d3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0005.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0005.png
index 0f2733484..0f2733484 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0006.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0006.png
index 3a43431e6..3a43431e6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0007.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0007.png
index 0def9ab08..0def9ab08 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0008.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0008.png
index 8cdafa67d..8cdafa67d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0009.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0009.png
index fec427b1c..fec427b1c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0010.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0010.png
index c6ee79918..c6ee79918 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0011.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0011.png
index 32ae2c278..32ae2c278 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0012.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0012.png
index 149a2d531..149a2d531 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0013.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0013.png
index 11653ec2d..11653ec2d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0014.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0014.png
index 62273288d..62273288d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0015.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0015.png
index ef7e67a39..ef7e67a39 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0016.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0016.png
index 4d1be5429..4d1be5429 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0017.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0017.png
index ace88c61e..ace88c61e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0018.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0018.png
index d0ef10a39..d0ef10a39 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0019.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0019.png
index 6fcef2451..6fcef2451 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0020.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0020.png
index b8989d91f..b8989d91f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0021.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0021.png
index bdc715c2c..bdc715c2c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0022.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0022.png
index 03175be99..03175be99 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0023.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0023.png
index d83ca0abe..d83ca0abe 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0024.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0024.png
index 27b5a1919..27b5a1919 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0025.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0025.png
index e09ed2d62..e09ed2d62 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0026.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0026.png
index cd5b5159c..cd5b5159c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0027.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0027.png
index 58f206dc4..58f206dc4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0028.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0028.png
index b6bf8b6c9..b6bf8b6c9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0029.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0029.png
index 9be1150d0..9be1150d0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0030.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0030.png
index 053725cd7..053725cd7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0031.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0031.png
index de901a6d5..de901a6d5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0032.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0032.png
index 1a6cd96ee..1a6cd96ee 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0033.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0033.png
index 7b9c8d9b3..7b9c8d9b3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0034.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0034.png
index aaa6ab85d..aaa6ab85d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0035.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0035.png
index f3623b582..f3623b582 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0036.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0036.png
index f90598e2f..f90598e2f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0037.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0037.png
index 813998686..813998686 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0038.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0038.png
index 7dd4c0bdf..7dd4c0bdf 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0039.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0039.png
index a3d7cc1a2..a3d7cc1a2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0040.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0040.png
index d8013a42e..d8013a42e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0041.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0041.png
index fe86252a3..fe86252a3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0042.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0042.png
index 97bec2302..97bec2302 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0043.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0043.png
index dbbbeae55..dbbbeae55 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0044.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0044.png
index 517f8f7db..517f8f7db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0045.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0045.png
index 186b984af..186b984af 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0046.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0046.png
index fef65e0fe..fef65e0fe 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0047.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0047.png
index 783531512..783531512 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0048.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0048.png
index 5e0f7470c..5e0f7470c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0049.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0049.png
index cabbbafa4..cabbbafa4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0050.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0050.png
index 41c85aad5..41c85aad5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0051.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0051.png
index 0522f3ed1..0522f3ed1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0052.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0052.png
index 580a9d7ac..580a9d7ac 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0053.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0053.png
index 3b112d78e..3b112d78e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0054.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0054.png
index ea91b2120..ea91b2120 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0055.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0055.png
index 150138714..150138714 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0056.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0056.png
index e266ce471..e266ce471 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0057.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0057.png
index 5efd497e1..5efd497e1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0058.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0058.png
index 05d4151b7..05d4151b7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0059.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0059.png
index 4945b91e4..4945b91e4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0060.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0060.png
index dcd393d6c..dcd393d6c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0061.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0061.png
index 8448d8c4e..8448d8c4e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0062.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0062.png
index d7d32db65..d7d32db65 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0063.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0063.png
index d7eb095d1..d7eb095d1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0064.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0064.png
index c4fd083b9..c4fd083b9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0065.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0065.png
index c918f5bb1..c918f5bb1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0066.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0066.png
index 4452eca6e..4452eca6e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0067.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0067.png
index c86c6ec94..c86c6ec94 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0068.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0068.png
index 185c03099..185c03099 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0069.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0069.png
index 13c600e53..13c600e53 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0070.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0070.png
index 065932f4a..065932f4a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0071.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0071.png
index 052fe4de9..052fe4de9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0072.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0072.png
index 7d4075c84..7d4075c84 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/trinity.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/trinity.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0001.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0001.png
index 62a4cca7d..62a4cca7d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0002.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0002.png
index 6b5f4f67b..6b5f4f67b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0003.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0003.png
index 16fd732f9..16fd732f9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0004.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0004.png
index c881ab039..c881ab039 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0005.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0005.png
index dc0d437f3..dc0d437f3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0006.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0006.png
index 6fef145a5..6fef145a5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0007.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0007.png
index 3d5325ceb..3d5325ceb 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0008.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0008.png
index 22d3b4568..22d3b4568 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0009.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0009.png
index 6c2a1571d..6c2a1571d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0010.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0010.png
index 522e3c267..522e3c267 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0011.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0011.png
index 291ab93a4..291ab93a4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0012.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0012.png
index 71076c54a..71076c54a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0013.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0013.png
index 840996a4e..840996a4e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0014.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0014.png
index a9e144b0c..a9e144b0c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0015.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0015.png
index 018ca12c7..018ca12c7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0016.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0016.png
index 1de98bb5e..1de98bb5e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0017.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0017.png
index dce51b588..dce51b588 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0018.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0018.png
index 71a0674c1..71a0674c1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0019.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0019.png
index 5ac269ce0..5ac269ce0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0020.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0020.png
index e38bf64e1..e38bf64e1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0021.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0021.png
index d1e1bb29d..d1e1bb29d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0022.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0022.png
index e25f1aafe..e25f1aafe 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0023.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0023.png
index 95fde4cbc..95fde4cbc 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0024.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0024.png
index 1b4e4285f..1b4e4285f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0025.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0025.png
index bd87a4fb5..bd87a4fb5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0026.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0026.png
index da1b9733e..da1b9733e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0027.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0027.png
index 0d0e6b800..0d0e6b800 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0028.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0028.png
index 6af6790cb..6af6790cb 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0029.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0029.png
index debbd8374..debbd8374 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0030.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0030.png
index 4462f08ab..4462f08ab 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0031.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0031.png
index f07043df9..f07043df9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0032.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0032.png
index edc1e5163..edc1e5163 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0033.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0033.png
index 1965bc810..1965bc810 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0034.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0034.png
index d3923cb0b..d3923cb0b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0035.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0035.png
index 411f18c59..411f18c59 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0036.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0036.png
index b3584e637..b3584e637 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0037.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0037.png
index b8064f240..b8064f240 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0038.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0038.png
index 9a27f2cfa..9a27f2cfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0039.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0039.png
index 76156e80a..76156e80a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0040.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0040.png
index 33ac207b7..33ac207b7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0041.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0041.png
index b9fb63587..b9fb63587 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0042.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0042.png
index b1afd00b2..b1afd00b2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0043.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0043.png
index 8f5eee381..8f5eee381 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0044.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0044.png
index c967c52fc..c967c52fc 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0045.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0045.png
index 90f6a2123..90f6a2123 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0046.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0046.png
index a9718594e..a9718594e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0047.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0047.png
index 74f707c16..74f707c16 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0048.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0048.png
index 40dfda7fd..40dfda7fd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0049.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0049.png
index d7943ae51..d7943ae51 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0050.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0050.png
index 3e4f2d407..3e4f2d407 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0051.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0051.png
index b1474f149..b1474f149 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0052.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0052.png
index adc09885e..adc09885e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0053.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0053.png
index b24872ab5..b24872ab5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0054.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0054.png
index 4ef2ce2bd..4ef2ce2bd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0055.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0055.png
index bf90f6c1c..bf90f6c1c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0056.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0056.png
index 298db1bb3..298db1bb3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0057.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0057.png
index 0a52acd26..0a52acd26 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0058.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0058.png
index 1283a40f5..1283a40f5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0059.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0059.png
index b7eae6a3c..b7eae6a3c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0060.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0060.png
index 562ebba8b..562ebba8b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0061.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0061.png
index 2b194a75f..2b194a75f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0062.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0062.png
index 5981d8cf0..5981d8cf0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0063.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0063.png
index f7949af01..f7949af01 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0064.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0064.png
index 387aeb997..387aeb997 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0065.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0065.png
index ef3eb775f..ef3eb775f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0066.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0066.png
index 3b77d62df..3b77d62df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0067.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0067.png
index ac7f7c554..ac7f7c554 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0068.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0068.png
index 71ee0aaef..71ee0aaef 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0069.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0069.png
index e1670bfaf..e1670bfaf 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0070.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0070.png
index 353c7a26a..353c7a26a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0071.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0071.png
index c9ec5e948..c9ec5e948 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0072.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0072.png
index 673327566..673327566 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/trinity.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/trinity.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0001.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0001.png
index 535e3683b..535e3683b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0002.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0002.png
index 5718ddd08..5718ddd08 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0003.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0003.png
index 1dd5c43e2..1dd5c43e2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0004.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0004.png
index d56f02661..d56f02661 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0005.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0005.png
index 1a1c4fddc..1a1c4fddc 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0006.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0006.png
index 64c25672b..64c25672b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0007.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0007.png
index 8dcfef3ac..8dcfef3ac 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0008.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0008.png
index b287d1fd6..b287d1fd6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0009.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0009.png
index 2e383c914..2e383c914 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0010.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0010.png
index eb57c0498..eb57c0498 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0011.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0011.png
index b2dcdba70..b2dcdba70 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0012.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0012.png
index bdbbff184..bdbbff184 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0013.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0013.png
index c8124b4a6..c8124b4a6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0014.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0014.png
index 30d7fda76..30d7fda76 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0015.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0015.png
index c8d77e26c..c8d77e26c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0016.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0016.png
index 0128c6093..0128c6093 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0017.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0017.png
index 15da969b8..15da969b8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0018.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0018.png
index 4daea4d9b..4daea4d9b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0019.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0019.png
index 4f9eb58a9..4f9eb58a9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0020.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0020.png
index a3698cdb2..a3698cdb2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0021.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0021.png
index ccf07a2a5..ccf07a2a5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0022.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0022.png
index 169d10cd4..169d10cd4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0023.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0023.png
index 13ff2bbd9..13ff2bbd9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0024.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0024.png
index 7614f8b74..7614f8b74 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0025.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0025.png
index 0793999e1..0793999e1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0026.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0026.png
index 9cafd0fe8..9cafd0fe8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0027.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0027.png
index 7ec236984..7ec236984 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0028.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0028.png
index c20b8b620..c20b8b620 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0029.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0029.png
index ec5eca3df..ec5eca3df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0030.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0030.png
index 95dc468f1..95dc468f1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0031.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0031.png
index f4631212f..f4631212f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0032.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0032.png
index 1ddfce5ba..1ddfce5ba 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0033.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0033.png
index 6a97caa09..6a97caa09 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0034.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0034.png
index df68a52be..df68a52be 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0035.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0035.png
index 716cb1c85..716cb1c85 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0036.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0036.png
index 2e679d43f..2e679d43f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0037.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0037.png
index 29aed6605..29aed6605 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0038.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0038.png
index b51a1e3bf..b51a1e3bf 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0039.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0039.png
index 1023f80ea..1023f80ea 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0040.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0040.png
index 12d462b6b..12d462b6b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0041.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0041.png
index 94a808810..94a808810 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0042.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0042.png
index b9a9d7096..b9a9d7096 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0043.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0043.png
index 1b3211aff..1b3211aff 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0044.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0044.png
index 674d18aa3..674d18aa3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0045.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0045.png
index 154382476..154382476 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0046.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0046.png
index 198173cca..198173cca 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0047.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0047.png
index 1a90e73dd..1a90e73dd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0048.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0048.png
index 6001404d3..6001404d3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0049.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0049.png
index 9beab2366..9beab2366 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0050.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0050.png
index 2c813649c..2c813649c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0051.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0051.png
index 5883cd03e..5883cd03e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0052.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0052.png
index d748ecf79..d748ecf79 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0053.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0053.png
index 26b83365f..26b83365f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0054.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0054.png
index 157d528ed..157d528ed 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0055.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0055.png
index bc7b53c0f..bc7b53c0f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0056.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0056.png
index 769b688df..769b688df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0057.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0057.png
index d3bd110f5..d3bd110f5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0058.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0058.png
index c1bb44cc6..c1bb44cc6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0059.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0059.png
index 3b8058324..3b8058324 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0060.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0060.png
index 93c59648c..93c59648c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0061.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0061.png
index 1d6b0539c..1d6b0539c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0062.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0062.png
index 4b1cf77a9..4b1cf77a9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0063.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0063.png
index b92d6f697..b92d6f697 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0064.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0064.png
index 7541ebca2..7541ebca2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0065.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0065.png
index 09f6dc073..09f6dc073 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0066.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0066.png
index 370774a34..370774a34 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0067.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0067.png
index 5dbb0fb59..5dbb0fb59 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0068.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0068.png
index 770d476db..770d476db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0069.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0069.png
index 5b3c17be8..5b3c17be8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0070.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0070.png
index 84d589923..84d589923 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0071.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0071.png
index 4dbc7ad29..4dbc7ad29 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0072.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0072.png
index b12a83c91..b12a83c91 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/trinity.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/trinity.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/gear.3ds b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/gear.3ds
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/gear.3ds
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/window-decoration-gradient-inactive.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/window-decoration-gradient-inactive.png
index 68d188519..68d188519 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/window-decoration-gradient-inactive.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/window-decoration-gradient-inactive.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/window-decoration-gradient.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/window-decoration-gradient.png
index a92934329..a92934329 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/window-decoration-gradient.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/window-decoration-gradient.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/backgroundrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/backgroundrc
index ca9ca66bb..ca9ca66bb 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/backgroundrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/backgroundrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/colour-schemes/kubuntuColours.kcsrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/colour-schemes/kubuntuColours.kcsrc
index d710e7edf..d710e7edf 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/colour-schemes/kubuntuColours.kcsrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/colour-schemes/kubuntuColours.kcsrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
index 93787b425..93787b425 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
index 9390d0633..9390d0633 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
index 93787b425..93787b425 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/X_cursor b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/X_cursor
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/X_cursor
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/X_cursor
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_down b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_down
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_down
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_up b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_up
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/base_arrow_up
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_down b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_down
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_down
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_up b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_up
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/based_arrow_up
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bd_double_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_left_corner b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_right_corner b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_side b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_side
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/bottom_side
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/center_ptr b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/center_ptr
index 325158011..325158011 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/center_ptr
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/center_ptr
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/circle b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/circle
index 40ce3ce06..40ce3ce06 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/circle
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/circle
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/copy b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/copy
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/copy
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/copy
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/cross b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/cross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/cross
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/cross
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/cross_reverse b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/cross_reverse
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/cross_reverse
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/cross_reverse
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/crossed_circle b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/crossed_circle
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/crossed_circle
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/crossed_circle
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/crosshair b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/crosshair
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/crosshair
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/crosshair
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
index 0930af82b..0930af82b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/dot b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/dot
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/dot
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/dot
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/dotbox b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/dotbox
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/dotbox
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/dotbox
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/double_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/double_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/double_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_large b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_large
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_large
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_large
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_small b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_small
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_small
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draft_small
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draped_box b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draped_box
index 13b748e9f..13b748e9f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draped_box
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/draped_box
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fd_double_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fleur b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fleur
index 9390d0633..9390d0633 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fleur
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/fleur
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/h_double_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/h_double_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/h_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand1 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand1
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand1
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand1
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand2 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand2
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand2
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/hand2
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr_watch b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_side b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_side
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/left_side
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/link b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/link
index 93787b425..93787b425 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/link
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/link
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/ll_angle b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/ll_angle
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/ll_angle
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/ll_angle
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/lr_angle b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/lr_angle
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/lr_angle
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/lr_angle
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/move b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/move
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/move
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/move
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/pencil b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/pencil
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/pencil
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/pencil
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/pirate b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/pirate
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/pirate
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/pirate
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/plus b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/plus
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/plus
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/plus
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/question_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/question_arrow
index 0930af82b..0930af82b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/question_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/question_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/right_ptr b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/right_ptr
index 47742d40e..47742d40e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/right_ptr
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/right_ptr
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/right_side b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/right_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/right_side
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/right_side
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_down_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
index a3743a37e..a3743a37e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_left_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
index b12f2f5c0..b12f2f5c0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_right_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
index 79fda1d7b..79fda1d7b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_up_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
index 325158011..325158011 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/tcross b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/tcross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/tcross
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/tcross
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_corner b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_corner
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_left_corner
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_right_corner b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_right_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_right_corner
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_right_corner
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_side b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_side
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/top_side
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/v_double_arrow b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/v_double_arrow
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/v_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/watch b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/watch
index e05fc1230..e05fc1230 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/watch
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/watch
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm
index e9e878124..e9e878124 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm_extra_large b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
index 45c947824..45c947824 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/index.theme b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/index.theme
index b4ad00443..b4ad00443 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/cursors/index.theme
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/cursors/index.theme
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/changelog
index 2fc3af7de..2fc3af7de 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/changelog
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/compat b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/compat
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/compat
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/control
index 9ce06c6e3..9ce06c6e3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/control
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/copyright b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/copyright
index 1dfa5cbb8..1dfa5cbb8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/copyright
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/copyright
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/.gitignore b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/distrospecific/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/distrospecific/.gitignore
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/distrospecific/.gitignore
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postinst b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postinst
index 678e2ac55..678e2ac55 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postinst
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postinst
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
index 3727a65c1..3727a65c1 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/rules b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/rules
index b6386b0d8..b6386b0d8 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/rules
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/rules
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/source/format b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/source/format
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/source/format
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/source/include-binaries b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/source/include-binaries
index 62e6d04b2..62e6d04b2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/source/include-binaries
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/source/include-binaries
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/source/options b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/source/options
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/source/options
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh b/ubuntu/_base/defaultsettings/kubuntu-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
index 77e73faf8..77e73faf8 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde b/ubuntu/_base/defaultsettings/kubuntu-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde
index 6bc424f8e..6bc424f8e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/_base/defaultsettings/kubuntu-default-settings/hal-policy-ntfs-config-write-policy.fdi
index 105c4f692..105c4f692 120000
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal-policy-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/hal-policy-ntfs-config-write-policy.fdi
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kaffeine/fileopen.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kaffeine/fileopen.svg
index 1c35cfed6..1c35cfed6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kaffeine/fileopen.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kaffeine/fileopen.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kaffeine/fileopen128.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kaffeine/fileopen128.png
index 7b3588497..7b3588497 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kaffeine/fileopen128.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kaffeine/fileopen128.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kaffeine/fileopen64.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kaffeine/fileopen64.png
index 068a38680..068a38680 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kaffeine/fileopen64.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kaffeine/fileopen64.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1 b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kaffeine/wizard_stamp_v0.7.1
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-hidden/directory-home b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-hidden/directory-home
index 519a93d87..519a93d87 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-hidden/directory-home
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-hidden/directory-home
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-hidden/directory-media b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-hidden/directory-media
index 3fba6cec6..3fba6cec6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-hidden/directory-media
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-hidden/directory-media
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-hidden/hidden-media b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-hidden/hidden-media
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-hidden/hidden-media
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/adept_managerrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/adept_managerrc
index 3e7f7533d..3e7f7533d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/adept_managerrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/adept_managerrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/adept_notifierrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/adept_notifierrc
index 86c6056ec..86c6056ec 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/adept_notifierrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/adept_notifierrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/amarokrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/amarokrc
index b02ab8b29..b02ab8b29 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/amarokrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/amarokrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/arkrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/arkrc
index 1b3188cb8..1b3188cb8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/arkrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/arkrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
index e54b81f63..e54b81f63 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/cryptodefaults b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/cryptodefaults
index cae93fc63..cae93fc63 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/cryptodefaults
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/d3lphinrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/d3lphinrc
index 93e4bc082..93e4bc082 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/d3lphinrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/d3lphinrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/k3b.eventsrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/k3b.eventsrc
index 3eb68c158..3eb68c158 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/k3b.eventsrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/k3b.eventsrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/k3brc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/k3brc
index 177e2c957..177e2c957 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/k3brc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/k3brc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kaffeinerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kaffeinerc
index 01a8e675c..01a8e675c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kaffeinerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kaffeinerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katapultrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/katapultrc
index d0a51f357..d0a51f357 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katapultrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/katapultrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc
index f952dff62..f952dff62 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/katerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kbookmarkrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kbookmarkrc
index d70bd649f..d70bd649f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kbookmarkrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kbookmarkrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcminputrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kcminputrc
index e007097a0..e007097a0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kcminputrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmlaptoprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmlaptoprc
index b1c36c638..b1c36c638 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmlaptoprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmlaptoprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
index a0209401b..a0209401b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcookiejarrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kdeglobals b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kdeglobals
index 502972019..502972019 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kdesktoprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kdesktoprc
index 41ae7dfb3..41ae7dfb3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kgpgrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kgpgrc
index 9aae01a60..9aae01a60 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kgpgrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kgpgrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/khelpcenterrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/khelpcenterrc
index c4d1f4dac..c4d1f4dac 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/khelpcenterrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/khelpcenterrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kickerrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kickerrc
index eaab006e6..eaab006e6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kickerrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/klipperrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/klipperrc
index 2819a62cd..2819a62cd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/klipperrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/klipperrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kmailrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kmailrc
index 07151b6a9..07151b6a9 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kmailrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kmailrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kmixrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kmixrc
index d0021119b..d0021119b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kmixrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kmixrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kmplayerrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kmplayerrc
index aac3c5721..aac3c5721 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kmplayerrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kmplayerrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/knemorc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/knemorc
index bce3ab226..bce3ab226 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/knemorc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/knemorc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/knotesrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/knotesrc
index befc44ca5..befc44ca5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/knotesrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/knotesrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/knotify.eventsrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/knotify.eventsrc
index 8d57ed914..8d57ed914 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/knotify.eventsrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/knotify.eventsrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/konqiconviewrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/konqiconviewrc
index 5510f2ce4..5510f2ce4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/konqiconviewrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/konqiconviewrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/konquerorrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/konquerorrc
index 25dc7ab4e..25dc7ab4e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/konquerorrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/konquerorrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/konsolerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/konsolerc
index 2e4e63301..2e4e63301 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/konsolerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/konsolerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kontactrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kontactrc
index a783507e2..a783507e2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kontactrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kontactrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/konversationrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/konversationrc
index 821eb3d25..821eb3d25 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/konversationrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/konversationrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kopeterc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kopeterc
index 6efe0ad0d..6efe0ad0d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kopeterc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kopeterc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/korgacrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/korgacrc
index f948d8c13..f948d8c13 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/korgacrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/korgacrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kscdrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kscdrc
index f552f8381..f552f8381 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kscdrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kscdrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/ksplashrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/ksplashrc
index b9b3b4707..b9b3b4707 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/ksplashrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/ksplashrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/ktiprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/ktiprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/ktiprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kuriikwsfilterrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kuriikwsfilterrc
index 5609ef964..5609ef964 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kuriikwsfilterrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kuriikwsfilterrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kuserrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kuserrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kuserrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
index e31c7d266..e31c7d266 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/metabarrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/metabarrc
index 6ade29f07..6ade29f07 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/metabarrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/metabarrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
index 4a507a9f7..4a507a9f7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/profilerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/profilerc
index 321d12cef..321d12cef 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/profilerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/profilerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/skimrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/skimrc
index 63381ac76..63381ac76 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/skimrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/skimrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdeio_httprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdelaunchrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/tdelaunchrc
index ac8e4ce06..ac8e4ce06 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdelaunchrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/tdelaunchrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/tdewalletrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc
index 14134537d..14134537d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/twinrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/twinrc
index bf263a870..bf263a870 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/twinrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/twinrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/uiserver b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/uiserver
index 932d73471..932d73471 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/uiserver
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/uiserver
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/yakuakerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/yakuakerc
index 14d4a035f..14d4a035f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/yakuakerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/yakuakerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/CHANGELOG b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/CHANGELOG
index 028c9fc89..028c9fc89 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/CHANGELOG
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/CHANGELOG
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/INSTALL b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/INSTALL
index ea8a37692..ea8a37692 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/INSTALL
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/INSTALL
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/LICENSE b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/LICENSE
index d64d3ac80..d64d3ac80 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/LICENSE
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/LICENSE
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/colors b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/colors
index ac65ca342..ac65ca342 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/colors
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/colors
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
index 5d8290a23..5d8290a23 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
index c5f9a5034..c5f9a5034 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
index 3eea0423a..3eea0423a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
index 6a2fefb14..6a2fefb14 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/news/down.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/news/down.svg
index 16f1f4199..16f1f4199 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/news/down.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/news/down.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/news/up.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/news/up.svg
index 7162e9353..7162e9353 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/news/up.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/news/up.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
index d68a79acd..d68a79acd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
index 412b3d684..412b3d684 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
index 3b947f614..3b947f614 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/theme.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/theme.desktop
index 334a3db9a..334a3db9a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/theme.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/theme.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
index a3c18d3e3..a3c18d3e3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
index 8e9fa9a35..8e9fa9a35 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/background.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
index dabb94e48..dabb94e48 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
index d83b884a2..d83b884a2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
index ec5abce8b..ec5abce8b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
index 967f4ed74..967f4ed74 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
index a8ab672f5..a8ab672f5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
index fc9b79f56..fc9b79f56 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
index 92e8fee60..92e8fee60 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
index ac63dd7c3..ac63dd7c3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
index c0bc6aa0c..c0bc6aa0c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
index 2afb85ea0..2afb85ea0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
index 44b5a068d..44b5a068d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
index 8adb0a1cf..8adb0a1cf 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
index 5279d6a4f..5279d6a4f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
index 33c56b2bd..33c56b2bd 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
index 201ac63e5..201ac63e5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
index de8d36599..de8d36599 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
index 983e57026..983e57026 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
index c3158d60d..c3158d60d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
index 6765b03de..6765b03de 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/directory-home b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/directory-home
index 2e7cb00ab..2e7cb00ab 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/directory-home
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/directory-home
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/directory-media b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/directory-media
index 303a02046..303a02046 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/directory-media
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/directory-media
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/hidden-media b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/hidden-media
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-hidden/hidden-media
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
index dde841be5..dde841be5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/cryptodefaults b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/cryptodefaults
index 837e3aa07..837e3aa07 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/cryptodefaults
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/dolphinrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/dolphinrc
index 684474d37..684474d37 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/dolphinrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/dolphinrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/katerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/katerc
index be120de43..be120de43 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/katerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/katerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcminputrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcminputrc
index b2fee2a64..b2fee2a64 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcminputrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
index 08ce6c33e..08ce6c33e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcookiejarrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kdeglobals b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kdeglobals
index e02c15643..e02c15643 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kmixrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kmixrc
index 8c6888651..8c6888651 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kmixrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kmixrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/ktiprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/ktiprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/ktiprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kuserrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kuserrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kuserrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwinrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwinrc
index 8f06aef78..8f06aef78 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwinrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwinrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdewalletrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kompmgr-rc-files/compton-tde.conf b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kompmgr-rc-files/compton-tde.conf
index 26c725969..26c725969 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kompmgr-rc-files/compton-tde.conf
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kompmgr-rc-files/compton-tde.conf
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kompmgr-rc-files/xcompmgrrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kompmgr-rc-files/xcompmgrrc
index 96e6b3c15..96e6b3c15 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kompmgr-rc-files/xcompmgrrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kompmgr-rc-files/xcompmgrrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/konqueror-profile/konq_plugins.xml b/ubuntu/_base/defaultsettings/kubuntu-default-settings/konqueror-profile/konq_plugins.xml
index 1df24cc92..1df24cc92 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/konqueror-profile/konq_plugins.xml
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/konqueror-profile/konq_plugins.xml
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-plugins/dirfilterplugin.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-plugins/dirfilterplugin.rc
index cb7bb0081..cb7bb0081 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-plugins/dirfilterplugin.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-plugins/dirfilterplugin.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc
index a45167843..a45167843 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
index df2c4f29f..df2c4f29f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/ark_part_readonly.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/gvimagepart.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/gvimagepart.rc
index 5e0cdf11a..5e0cdf11a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/gvimagepart.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/gvimagepart.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ksvgplugin.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/ksvgplugin.rc
index abf3537d7..abf3537d7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/ksvgplugin.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/ksvgplugin.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/part.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/part.rc
index e7ecb2f3d..e7ecb2f3d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/part.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/part.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
index 069870b55..069870b55 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/tdehtml_browser.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-7z.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-7z.desktop
index 66083b4a0..66083b4a0 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-7z.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-7z.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-ace.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-ace.desktop
index 9d2484d2c..9d2484d2c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-ace.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-ace.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-arc.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-arc.desktop
index 0481ebb03..0481ebb03 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-arc.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-arc.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-archive.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-archive.desktop
index e68c7767b..e68c7767b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-archive.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-archive.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-arj.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-arj.desktop
index b139ae430..b139ae430 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-arj.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-arj.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-bzip.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-bzip.desktop
index 3e4a5ae35..3e4a5ae35 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-bzip.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-bzip.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-bzip2.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-bzip2.desktop
index 1e374ca30..1e374ca30 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-bzip2.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-bzip2.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-compress.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-compress.desktop
index caa974dda..caa974dda 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-compress.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-compress.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-cpio.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-cpio.desktop
index 028584be7..028584be7 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-cpio.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-cpio.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-gzip.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-gzip.desktop
index 1fcb83b99..1fcb83b99 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-gzip.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-gzip.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-lha.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-lha.desktop
index 6d14dc9ec..6d14dc9ec 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-lha.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-lha.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-lzop.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-lzop.desktop
index eaea7533f..eaea7533f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-lzop.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-lzop.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-pak.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-pak.desktop
index 6bb24c32d..6bb24c32d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-pak.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-pak.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-rar.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-rar.desktop
index 6d8f0695f..6d8f0695f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-rar.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-rar.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tar.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tar.desktop
index bf9778f53..bf9778f53 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tar.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tar.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tarz.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tarz.desktop
index b1e44f1f5..b1e44f1f5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tarz.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tarz.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tbz.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tbz.desktop
index c01f6296c..c01f6296c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tbz.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tbz.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tgz.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tgz.desktop
index 9c0264556..9c0264556 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tgz.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tgz.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tzo.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tzo.desktop
index 57d65bfff..57d65bfff 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-tzo.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-tzo.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-zip.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-zip.desktop
index 8c4a6d075..8c4a6d075 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-zip.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-zip.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-zoo.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-zoo.desktop
index b1ce82a51..b1ce82a51 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/mimelnk/x-zoo.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/mimelnk/x-zoo.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/qt-rc-files/kstylerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/qt-rc-files/kstylerc
index 6c639810f..6c639810f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/qt-rc-files/kstylerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/qt-rc-files/kstylerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/qt-rc-files/lipstikstylerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/qt-rc-files/lipstikstylerc
index c1c892daa..c1c892daa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/qt-rc-files/lipstikstylerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/qt-rc-files/lipstikstylerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/qt-rc-files/polyesterstylerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/qt-rc-files/polyesterstylerc
index 8526d4fa6..8526d4fa6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/qt-rc-files/polyesterstylerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/qt-rc-files/polyesterstylerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/qtcurve-rc-files/stylerc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/qtcurve-rc-files/stylerc
index 73c2faa15..73c2faa15 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/qtcurve-rc-files/stylerc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/qtcurve-rc-files/stylerc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/kde4rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tde-profile/kde4rc
index d08a1fe0b..d08a1fe0b 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/kde4rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tde-profile/kde4rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/tde-user-profile b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/tde-user-profile
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tde-profile/tde-user-profile
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/tderc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tde-profile/tderc
index 8bb08502d..8bb08502d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/tderc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tde-profile/tderc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/tdewallet.kwl b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/tdewallet.kwl
index 485b2e683..485b2e683 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/tdewallet.kwl
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tdewallet-default-wallet/tdewallet.kwl
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdmdistrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tdmdistrc
index 65425be5f..65425be5f 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tdmdistrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/tdmdistrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/ui-rc-files/gwenviewui.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/ui-rc-files/gwenviewui.rc
index 3a7b72ba4..3a7b72ba4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/ui-rc-files/gwenviewui.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/ui-rc-files/gwenviewui.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/ui-rc-files/konqueror.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/ui-rc-files/konqueror.rc
index cab74b6e5..cab74b6e5 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/ui-rc-files/konqueror.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/ui-rc-files/konqueror.rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/ui-rc-files/kopetechatwindow.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/ui-rc-files/kopetechatwindow.rc
index 56b534b10..56b534b10 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/ui-rc-files/kopetechatwindow.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/ui-rc-files/kopetechatwindow.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/Makefile
index 7270b7db6..7270b7db6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/Makefile
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdeglobals b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdeglobals
index 9c975c1cd..9c975c1cd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdeglobals
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdesktoprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdesktoprc
index d169791dc..d169791dc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/konquerorrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/konquerorrc
index 8a3b98da1..8a3b98da1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/konquerorrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/konquerorrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/ksmserverrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/ksmserverrc
index 9f757e982..9f757e982 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/ksmserverrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/ksmserverrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kwinrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kwinrc
index 3f17db0cc..3f17db0cc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kwinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/kwinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
index f23049399..f23049399 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kaccessrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kaccessrc
index 30b66b640..30b66b640 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kaccessrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kaccessrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kcminputrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kcminputrc
index da0aed512..da0aed512 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kcminputrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kcminputrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kickerrc
index 30780e137..30780e137 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/ksmserverrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/ksmserverrc
index db7d79686..db7d79686 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/ksmserverrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/ksmserverrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kvkbdrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kvkbdrc
index e87700ebf..e87700ebf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kvkbdrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/minor-motor-difficulties/kvkbdrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdeglobals b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdeglobals
index d636dd0c4..d636dd0c4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdeglobals
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdesktoprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdesktoprc
index ac89fb28a..ac89fb28a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/konquerorrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/konquerorrc
index 516543fbe..516543fbe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/konquerorrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/konquerorrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kwinrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kwinrc
index 6a82a4eb1..6a82a4eb1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kwinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/moderate-visual-impairment/kwinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/kmousetoolrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
index 82767e58c..82767e58c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/ksmserverrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/ksmserverrc
index 067e50c3f..067e50c3f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/ksmserverrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/accessibility/motor-difficulties-pointing-devices/ksmserverrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/background.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/amarok/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/background.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/amarok/background.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/head.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/amarok/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/head.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/amarok/head.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/stylesheet.css b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/amarok/stylesheet.css
index 6bf2ded5c..6bf2ded5c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/amarok/stylesheet.css
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/amarok/stylesheet.css
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/edgyWallpaper.tar.gz b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/edgyWallpaper.tar.gz
index f100041c8..f100041c8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/edgyWallpaper.tar.gz
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/edgyWallpaper.tar.gz
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/enterprise-desktop.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/enterprise-desktop.png
index 4b1f883f4..4b1f883f4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/enterprise-desktop.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/enterprise-desktop.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
index 4035e27f7..4035e27f7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
index a57917b8f..a57917b8f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
index e1a2648ef..e1a2648ef 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
index 7ed5de679..7ed5de679 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
index c1c8ed284..c1c8ed284 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
index 052defc97..052defc97 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
index 79c19f6aa..79c19f6aa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
index 62a48fd3c..62a48fd3c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
index f69fd57b3..f69fd57b3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
index 18efbfac8..18efbfac8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
index 3b7723190..3b7723190 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
index 439b94c30..439b94c30 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
index 4eb7120af..4eb7120af 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
index 911dfe880..911dfe880 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
index 70a2419bf..70a2419bf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
index 29fe66b86..29fe66b86 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
index c24c5f25a..c24c5f25a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
index 5d5cd8f7a..5d5cd8f7a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
index f379812ae..f379812ae 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
index d877af31f..d877af31f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
index 457eb7c30..457eb7c30 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
index e178dbc96..e178dbc96 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
index 4e6ba5f0d..4e6ba5f0d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
index 6eb18effe..6eb18effe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1024x768.jpg
index 7a598f8fa..7a598f8fa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
index 21f1db0a9..21f1db0a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x800.jpg
index 3f775c120..3f775c120 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1440x900.jpg
index 127636b9c..127636b9c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
index 535b5a960..535b5a960 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
index 6a96381e8..6a96381e8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
index 7e3b5c237..7e3b5c237 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
index 3cbc9d021..3cbc9d021 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
index 66d8724a9..66d8724a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
index 1553e7ede..1553e7ede 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
index 05707f46b..05707f46b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
index 0eeb356d1..0eeb356d1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
index 53dfbe91b..53dfbe91b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
index 9ae3f39bd..9ae3f39bd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
index 4bb9e4776..4bb9e4776 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
index 2f625a0d5..2f625a0d5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
index b38ee6b2a..b38ee6b2a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
index 480dfacfc..480dfacfc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
index 651c1dfc5..651c1dfc5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
index 2815769b7..2815769b7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
index dd11781b1..dd11781b1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
index f2d724ef7..f2d724ef7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
index 4e67b2a90..4e67b2a90 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
index 07337d9d5..07337d9d5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
index 699fc1e92..699fc1e92 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
index 0f82327b5..0f82327b5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
index 7300ba787..7300ba787 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
index b3227967a..b3227967a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
index 46d47ff57..46d47ff57 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
index 08c0d35ce..08c0d35ce 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
index e8834b503..e8834b503 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
index 99b6d84d7..99b6d84d7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
index bcfeb457c..bcfeb457c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
index cd3b16311..cd3b16311 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
index e3bc89bd9..e3bc89bd9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
index 81cac6f6d..81cac6f6d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
index 12ecd19df..12ecd19df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
index 1bf5576c1..1bf5576c1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
index d4a8a695a..d4a8a695a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
index af08bfd29..af08bfd29 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
index 7cbaf7f39..7cbaf7f39 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
index 30234263f..30234263f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
index 631b5297b..631b5297b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
index a0e458ce3..a0e458ce3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
index 25c677bbd..25c677bbd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
index a1fa8d5bb..a1fa8d5bb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
index 701db348c..701db348c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
index dd8319f19..dd8319f19 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
index 00fe97041..00fe97041 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
index 9fc47822e..9fc47822e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
index e3d0db71e..e3d0db71e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
index bb4e1fa6a..bb4e1fa6a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
index e2dbb6eb9..e2dbb6eb9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
index 516440ff0..516440ff0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
index c80e146fc..c80e146fc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
index 2d770f592..2d770f592 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
index 59c3fc3ab..59c3fc3ab 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
index c10cddd17..c10cddd17 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
index c1dda4800..c1dda4800 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
index 6d1986090..6d1986090 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
index 454750639..454750639 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
index 75bf53846..75bf53846 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
index 47ead04aa..47ead04aa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
index bb1253f3f..bb1253f3f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
index aea4f9fc8..aea4f9fc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
index 404004c19..404004c19 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
index 0f7d98144..0f7d98144 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
index 37d0f2015..37d0f2015 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
index a8a1ec58f..a8a1ec58f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
index 7b1673249..7b1673249 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
index eeafc3e93..eeafc3e93 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
index dc835d4d3..dc835d4d3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
index 1f46d48b7..1f46d48b7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
index d2322d955..d2322d955 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
index b08244f2d..b08244f2d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
index 7cec0df71..7cec0df71 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
index bf2d55534..bf2d55534 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
index f4e905f77..f4e905f77 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
index a6cc84cd2..a6cc84cd2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
index 8bb7904c6..8bb7904c6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
index 6b92df4c9..6b92df4c9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
index 295544140..295544140 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
index 6296ebb49..6296ebb49 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
index cfd571d31..cfd571d31 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/index.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/index.desktop
index 4159027ea..4159027ea 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/index.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/index.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_admin.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_admin.png
index 89120c90f..89120c90f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_admin.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_admin.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_away.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_away.png
index 897801f62..897801f62 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_away.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_away.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_halfop.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_halfop.png
index c6189edf6..c6189edf6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_halfop.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_halfop.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_normal.png
index 813f8d70e..813f8d70e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_op.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_op.png
index 1667de67e..1667de67e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_op.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_op.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_owner.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_owner.png
index 7df96f8c9..7df96f8c9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_owner.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_owner.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_voice.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_voice.png
index e4f9f41a5..e4f9f41a5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_voice.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/konversation/irc_voice.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Dialog.png
index 84a8c8a13..84a8c8a13 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Preview.png
index 09655c689..09655c689 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/ReadMe.txt b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/ReadMe.txt
index 3c7d9763d..3c7d9763d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/ReadMe.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/ReadMe.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Theme.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Theme.rc
index d0bd905c5..d0bd905c5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Theme.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/Theme.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/ksplash/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/ksplash/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-hardy-wallpaper.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-hardy-wallpaper.jpg
index a42ebde69..a42ebde69 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-hardy-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-hardy-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-intrepid-wallpaper.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-intrepid-wallpaper.jpg
index 052defc97..052defc97 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-intrepid-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-intrepid-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-jaunty-wallpaper.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-jaunty-wallpaper.jpg
index be7e79b60..be7e79b60 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-jaunty-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-jaunty-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-kmenu-side-tile.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-kmenu-side-tile.png
index 220310005..220310005 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-kmenu-side-tile.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-kmenu-side-tile.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-kmenu-side.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-kmenu-side.png
index 84cc1343e..84cc1343e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-kmenu-side.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-kmenu-side.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-konqueror-background-classic.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-konqueror-background-classic.png
index f11dfa17b..f11dfa17b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-konqueror-background-classic.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-konqueror-background-classic.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-konqueror-background.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-konqueror-background.png
index 5be2c9e2a..5be2c9e2a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-konqueror-background.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-konqueror-background.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-login.ogg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-login.ogg
index 349c13f15..349c13f15 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-login.ogg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-login.ogg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-lucid-wallpaper.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-lucid-wallpaper.jpg
index c24aead02..c24aead02 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-lucid-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-lucid-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-panel.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-panel.png
index 8f01995da..8f01995da 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-panel.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-panel.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper-alternate.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper-alternate.jpg
index e62d362e3..e62d362e3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper-alternate.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper-alternate.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png
index 5edd07e8b..5edd07e8b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png.desktop
index 3f755fe75..3f755fe75 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kubuntu-wallpaper.png.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/metabar/background.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/metabar/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/metabar/background.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/metabar/background.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/metabar/default.css b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/metabar/default.css
index c8da33422..c8da33422 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/metabar/default.css
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/metabar/default.css
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/metabar/head.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/metabar/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/metabar/head.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/metabar/head.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/metabar/layout.html b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/metabar/layout.html
index 92669de64..92669de64 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/metabar/layout.html
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/metabar/layout.html
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/Dialog.png
index 801c4882a..801c4882a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
index d1507f55f..d1507f55f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/kubuntu.xml b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/kubuntu.xml
index 5f0fb8bf6..5f0fb8bf6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme-no-userlist/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/Dialog.png
index 4ad6c8ab4..4ad6c8ab4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/GdmGreeterTheme.desktop
index dcbca7a27..dcbca7a27 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/kubuntu.xml b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/kubuntu.xml
index 5d1c437da..5d1c437da 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/tdm-theme/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0001.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0001.png
index 2511fe958..2511fe958 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0002.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0002.png
index 437dbb652..437dbb652 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0003.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0003.png
index 757a84acd..757a84acd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0004.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0004.png
index f50f9fb9c..f50f9fb9c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0005.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0005.png
index 5b2838708..5b2838708 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0006.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0006.png
index f9f09e15f..f9f09e15f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0007.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0007.png
index 71a89d7b8..71a89d7b8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0008.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0008.png
index 2ada75115..2ada75115 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0009.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0009.png
index 57dabb733..57dabb733 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0010.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0010.png
index 1f9e457d9..1f9e457d9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0011.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0011.png
index a184e2a81..a184e2a81 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0012.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0012.png
index 7bebbe7b1..7bebbe7b1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0013.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0013.png
index 7062df661..7062df661 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0014.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0014.png
index 8ff603dcd..8ff603dcd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0015.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0015.png
index 84cd48dd9..84cd48dd9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0016.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0016.png
index 0e07dfcff..0e07dfcff 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0017.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0017.png
index ef20e4107..ef20e4107 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0018.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0018.png
index 10ac1f14f..10ac1f14f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0019.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0019.png
index 3dbca061e..3dbca061e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0020.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0020.png
index d5bcca606..d5bcca606 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0021.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0021.png
index fe8dfe828..fe8dfe828 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0022.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0022.png
index 309d39506..309d39506 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0023.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0023.png
index 45f493385..45f493385 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0024.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0024.png
index 3b1f4b62b..3b1f4b62b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0025.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0025.png
index 2a7569bb9..2a7569bb9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0026.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0026.png
index 60a2d9a4b..60a2d9a4b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0027.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0027.png
index 57d8ddf90..57d8ddf90 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0028.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0028.png
index 07f6f6442..07f6f6442 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0029.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0029.png
index 1a7f87398..1a7f87398 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0030.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0030.png
index db3700633..db3700633 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0031.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0031.png
index 5bc157309..5bc157309 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0032.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0032.png
index 5ba70fe7e..5ba70fe7e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0033.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0033.png
index a97437d41..a97437d41 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0034.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0034.png
index 363bb34bc..363bb34bc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0035.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0035.png
index 971bf0547..971bf0547 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0036.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0036.png
index f3c0b17d4..f3c0b17d4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0037.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0037.png
index c305d3548..c305d3548 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0038.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0038.png
index ea578703e..ea578703e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0039.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0039.png
index 4c9888fc1..4c9888fc1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0040.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0040.png
index 0b753ff8d..0b753ff8d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0041.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0041.png
index 706f08d66..706f08d66 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0042.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0042.png
index 776ef28ce..776ef28ce 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0043.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0043.png
index 381e49bbf..381e49bbf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0044.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0044.png
index 6e7eeb9e4..6e7eeb9e4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0045.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0045.png
index 4ba9a2d8d..4ba9a2d8d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0046.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0046.png
index d1e7fc959..d1e7fc959 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0047.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0047.png
index ceffb05ac..ceffb05ac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0048.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0048.png
index bf0dd17e9..bf0dd17e9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0049.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0049.png
index 1eed36bcd..1eed36bcd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0050.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0050.png
index 6537b166c..6537b166c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0051.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0051.png
index 95e75617b..95e75617b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0052.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0052.png
index 5fbb023b6..5fbb023b6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0053.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0053.png
index 187639e22..187639e22 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0054.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0054.png
index f4fde2f12..f4fde2f12 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0055.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0055.png
index 8b1d48c4b..8b1d48c4b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0056.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0056.png
index bfe7141fa..bfe7141fa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0057.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0057.png
index c16c862d6..c16c862d6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0058.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0058.png
index 00755b7f8..00755b7f8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0059.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0059.png
index 58d49bf28..58d49bf28 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0060.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0060.png
index 6f29bb960..6f29bb960 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0061.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0061.png
index 399da3623..399da3623 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0062.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0062.png
index 3901d3fa3..3901d3fa3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0063.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0063.png
index 146f4d92a..146f4d92a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0064.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0064.png
index f624dfad7..f624dfad7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0065.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0065.png
index 80d9750a8..80d9750a8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0066.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0066.png
index 6862242fa..6862242fa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0067.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0067.png
index 21969eadd..21969eadd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0068.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0068.png
index 93450476f..93450476f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0069.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0069.png
index 8d82bd420..8d82bd420 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0070.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0070.png
index 9c952753f..9c952753f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0071.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0071.png
index afe03e426..afe03e426 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0072.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0072.png
index c5898d2f5..c5898d2f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/trinity.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/trinity.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0001.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0001.png
index 4cc0e63d7..4cc0e63d7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0002.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0002.png
index 47ffe7f5c..47ffe7f5c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0003.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0003.png
index 9c430f17c..9c430f17c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0004.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0004.png
index ce1b601d3..ce1b601d3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0005.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0005.png
index 0f2733484..0f2733484 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0006.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0006.png
index 3a43431e6..3a43431e6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0007.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0007.png
index 0def9ab08..0def9ab08 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0008.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0008.png
index 8cdafa67d..8cdafa67d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0009.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0009.png
index fec427b1c..fec427b1c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0010.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0010.png
index c6ee79918..c6ee79918 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0011.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0011.png
index 32ae2c278..32ae2c278 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0012.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0012.png
index 149a2d531..149a2d531 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0013.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0013.png
index 11653ec2d..11653ec2d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0014.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0014.png
index 62273288d..62273288d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0015.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0015.png
index ef7e67a39..ef7e67a39 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0016.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0016.png
index 4d1be5429..4d1be5429 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0017.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0017.png
index ace88c61e..ace88c61e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0018.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0018.png
index d0ef10a39..d0ef10a39 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0019.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0019.png
index 6fcef2451..6fcef2451 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0020.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0020.png
index b8989d91f..b8989d91f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0021.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0021.png
index bdc715c2c..bdc715c2c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0022.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0022.png
index 03175be99..03175be99 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0023.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0023.png
index d83ca0abe..d83ca0abe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0024.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0024.png
index 27b5a1919..27b5a1919 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0025.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0025.png
index e09ed2d62..e09ed2d62 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0026.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0026.png
index cd5b5159c..cd5b5159c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0027.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0027.png
index 58f206dc4..58f206dc4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0028.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0028.png
index b6bf8b6c9..b6bf8b6c9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0029.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0029.png
index 9be1150d0..9be1150d0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0030.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0030.png
index 053725cd7..053725cd7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0031.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0031.png
index de901a6d5..de901a6d5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0032.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0032.png
index 1a6cd96ee..1a6cd96ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0033.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0033.png
index 7b9c8d9b3..7b9c8d9b3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0034.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0034.png
index aaa6ab85d..aaa6ab85d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0035.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0035.png
index f3623b582..f3623b582 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0036.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0036.png
index f90598e2f..f90598e2f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0037.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0037.png
index 813998686..813998686 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0038.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0038.png
index 7dd4c0bdf..7dd4c0bdf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0039.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0039.png
index a3d7cc1a2..a3d7cc1a2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0040.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0040.png
index d8013a42e..d8013a42e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0041.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0041.png
index fe86252a3..fe86252a3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0042.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0042.png
index 97bec2302..97bec2302 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0043.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0043.png
index dbbbeae55..dbbbeae55 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0044.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0044.png
index 517f8f7db..517f8f7db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0045.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0045.png
index 186b984af..186b984af 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0046.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0046.png
index fef65e0fe..fef65e0fe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0047.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0047.png
index 783531512..783531512 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0048.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0048.png
index 5e0f7470c..5e0f7470c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0049.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0049.png
index cabbbafa4..cabbbafa4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0050.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0050.png
index 41c85aad5..41c85aad5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0051.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0051.png
index 0522f3ed1..0522f3ed1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0052.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0052.png
index 580a9d7ac..580a9d7ac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0053.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0053.png
index 3b112d78e..3b112d78e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0054.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0054.png
index ea91b2120..ea91b2120 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0055.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0055.png
index 150138714..150138714 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0056.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0056.png
index e266ce471..e266ce471 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0057.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0057.png
index 5efd497e1..5efd497e1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0058.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0058.png
index 05d4151b7..05d4151b7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0059.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0059.png
index 4945b91e4..4945b91e4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0060.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0060.png
index dcd393d6c..dcd393d6c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0061.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0061.png
index 8448d8c4e..8448d8c4e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0062.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0062.png
index d7d32db65..d7d32db65 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0063.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0063.png
index d7eb095d1..d7eb095d1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0064.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0064.png
index c4fd083b9..c4fd083b9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0065.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0065.png
index c918f5bb1..c918f5bb1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0066.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0066.png
index 4452eca6e..4452eca6e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0067.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0067.png
index c86c6ec94..c86c6ec94 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0068.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0068.png
index 185c03099..185c03099 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0069.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0069.png
index 13c600e53..13c600e53 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0070.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0070.png
index 065932f4a..065932f4a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0071.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0071.png
index 052fe4de9..052fe4de9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0072.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0072.png
index 7d4075c84..7d4075c84 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/trinity.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/trinity.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0001.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0001.png
index 62a4cca7d..62a4cca7d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0002.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0002.png
index 6b5f4f67b..6b5f4f67b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0003.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0003.png
index 16fd732f9..16fd732f9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0004.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0004.png
index c881ab039..c881ab039 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0005.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0005.png
index dc0d437f3..dc0d437f3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0006.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0006.png
index 6fef145a5..6fef145a5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0007.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0007.png
index 3d5325ceb..3d5325ceb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0008.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0008.png
index 22d3b4568..22d3b4568 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0009.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0009.png
index 6c2a1571d..6c2a1571d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0010.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0010.png
index 522e3c267..522e3c267 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0011.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0011.png
index 291ab93a4..291ab93a4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0012.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0012.png
index 71076c54a..71076c54a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0013.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0013.png
index 840996a4e..840996a4e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0014.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0014.png
index a9e144b0c..a9e144b0c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0015.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0015.png
index 018ca12c7..018ca12c7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0016.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0016.png
index 1de98bb5e..1de98bb5e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0017.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0017.png
index dce51b588..dce51b588 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0018.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0018.png
index 71a0674c1..71a0674c1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0019.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0019.png
index 5ac269ce0..5ac269ce0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0020.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0020.png
index e38bf64e1..e38bf64e1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0021.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0021.png
index d1e1bb29d..d1e1bb29d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0022.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0022.png
index e25f1aafe..e25f1aafe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0023.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0023.png
index 95fde4cbc..95fde4cbc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0024.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0024.png
index 1b4e4285f..1b4e4285f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0025.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0025.png
index bd87a4fb5..bd87a4fb5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0026.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0026.png
index da1b9733e..da1b9733e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0027.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0027.png
index 0d0e6b800..0d0e6b800 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0028.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0028.png
index 6af6790cb..6af6790cb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0029.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0029.png
index debbd8374..debbd8374 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0030.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0030.png
index 4462f08ab..4462f08ab 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0031.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0031.png
index f07043df9..f07043df9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0032.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0032.png
index edc1e5163..edc1e5163 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0033.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0033.png
index 1965bc810..1965bc810 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0034.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0034.png
index d3923cb0b..d3923cb0b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0035.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0035.png
index 411f18c59..411f18c59 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0036.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0036.png
index b3584e637..b3584e637 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0037.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0037.png
index b8064f240..b8064f240 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0038.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0038.png
index 9a27f2cfa..9a27f2cfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0039.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0039.png
index 76156e80a..76156e80a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0040.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0040.png
index 33ac207b7..33ac207b7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0041.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0041.png
index b9fb63587..b9fb63587 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0042.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0042.png
index b1afd00b2..b1afd00b2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0043.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0043.png
index 8f5eee381..8f5eee381 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0044.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0044.png
index c967c52fc..c967c52fc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0045.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0045.png
index 90f6a2123..90f6a2123 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0046.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0046.png
index a9718594e..a9718594e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0047.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0047.png
index 74f707c16..74f707c16 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0048.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0048.png
index 40dfda7fd..40dfda7fd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0049.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0049.png
index d7943ae51..d7943ae51 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0050.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0050.png
index 3e4f2d407..3e4f2d407 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0051.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0051.png
index b1474f149..b1474f149 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0052.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0052.png
index adc09885e..adc09885e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0053.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0053.png
index b24872ab5..b24872ab5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0054.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0054.png
index 4ef2ce2bd..4ef2ce2bd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0055.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0055.png
index bf90f6c1c..bf90f6c1c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0056.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0056.png
index 298db1bb3..298db1bb3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0057.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0057.png
index 0a52acd26..0a52acd26 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0058.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0058.png
index 1283a40f5..1283a40f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0059.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0059.png
index b7eae6a3c..b7eae6a3c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0060.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0060.png
index 562ebba8b..562ebba8b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0061.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0061.png
index 2b194a75f..2b194a75f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0062.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0062.png
index 5981d8cf0..5981d8cf0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0063.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0063.png
index f7949af01..f7949af01 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0064.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0064.png
index 387aeb997..387aeb997 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0065.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0065.png
index ef3eb775f..ef3eb775f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0066.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0066.png
index 3b77d62df..3b77d62df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0067.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0067.png
index ac7f7c554..ac7f7c554 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0068.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0068.png
index 71ee0aaef..71ee0aaef 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0069.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0069.png
index e1670bfaf..e1670bfaf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0070.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0070.png
index 353c7a26a..353c7a26a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0071.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0071.png
index c9ec5e948..c9ec5e948 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0072.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0072.png
index 673327566..673327566 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/trinity.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/trinity.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0001.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0001.png
index 535e3683b..535e3683b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0002.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0002.png
index 5718ddd08..5718ddd08 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0003.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0003.png
index 1dd5c43e2..1dd5c43e2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0004.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0004.png
index d56f02661..d56f02661 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0005.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0005.png
index 1a1c4fddc..1a1c4fddc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0006.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0006.png
index 64c25672b..64c25672b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0007.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0007.png
index 8dcfef3ac..8dcfef3ac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0008.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0008.png
index b287d1fd6..b287d1fd6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0009.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0009.png
index 2e383c914..2e383c914 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0010.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0010.png
index eb57c0498..eb57c0498 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0011.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0011.png
index b2dcdba70..b2dcdba70 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0012.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0012.png
index bdbbff184..bdbbff184 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0013.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0013.png
index c8124b4a6..c8124b4a6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0014.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0014.png
index 30d7fda76..30d7fda76 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0015.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0015.png
index c8d77e26c..c8d77e26c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0016.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0016.png
index 0128c6093..0128c6093 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0017.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0017.png
index 15da969b8..15da969b8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0018.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0018.png
index 4daea4d9b..4daea4d9b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0019.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0019.png
index 4f9eb58a9..4f9eb58a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0020.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0020.png
index a3698cdb2..a3698cdb2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0021.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0021.png
index ccf07a2a5..ccf07a2a5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0022.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0022.png
index 169d10cd4..169d10cd4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0023.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0023.png
index 13ff2bbd9..13ff2bbd9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0024.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0024.png
index 7614f8b74..7614f8b74 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0025.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0025.png
index 0793999e1..0793999e1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0026.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0026.png
index 9cafd0fe8..9cafd0fe8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0027.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0027.png
index 7ec236984..7ec236984 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0028.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0028.png
index c20b8b620..c20b8b620 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0029.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0029.png
index ec5eca3df..ec5eca3df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0030.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0030.png
index 95dc468f1..95dc468f1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0031.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0031.png
index f4631212f..f4631212f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0032.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0032.png
index 1ddfce5ba..1ddfce5ba 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0033.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0033.png
index 6a97caa09..6a97caa09 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0034.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0034.png
index df68a52be..df68a52be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0035.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0035.png
index 716cb1c85..716cb1c85 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0036.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0036.png
index 2e679d43f..2e679d43f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0037.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0037.png
index 29aed6605..29aed6605 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0038.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0038.png
index b51a1e3bf..b51a1e3bf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0039.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0039.png
index 1023f80ea..1023f80ea 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0040.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0040.png
index 12d462b6b..12d462b6b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0041.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0041.png
index 94a808810..94a808810 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0042.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0042.png
index b9a9d7096..b9a9d7096 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0043.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0043.png
index 1b3211aff..1b3211aff 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0044.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0044.png
index 674d18aa3..674d18aa3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0045.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0045.png
index 154382476..154382476 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0046.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0046.png
index 198173cca..198173cca 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0047.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0047.png
index 1a90e73dd..1a90e73dd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0048.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0048.png
index 6001404d3..6001404d3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0049.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0049.png
index 9beab2366..9beab2366 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0050.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0050.png
index 2c813649c..2c813649c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0051.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0051.png
index 5883cd03e..5883cd03e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0052.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0052.png
index d748ecf79..d748ecf79 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0053.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0053.png
index 26b83365f..26b83365f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0054.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0054.png
index 157d528ed..157d528ed 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0055.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0055.png
index bc7b53c0f..bc7b53c0f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0056.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0056.png
index 769b688df..769b688df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0057.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0057.png
index d3bd110f5..d3bd110f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0058.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0058.png
index c1bb44cc6..c1bb44cc6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0059.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0059.png
index 3b8058324..3b8058324 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0060.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0060.png
index 93c59648c..93c59648c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0061.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0061.png
index 1d6b0539c..1d6b0539c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0062.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0062.png
index 4b1cf77a9..4b1cf77a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0063.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0063.png
index b92d6f697..b92d6f697 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0064.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0064.png
index 7541ebca2..7541ebca2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0065.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0065.png
index 09f6dc073..09f6dc073 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0066.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0066.png
index 370774a34..370774a34 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0067.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0067.png
index 5dbb0fb59..5dbb0fb59 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0068.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0068.png
index 770d476db..770d476db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0069.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0069.png
index 5b3c17be8..5b3c17be8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0070.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0070.png
index 84d589923..84d589923 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0071.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0071.png
index 4dbc7ad29..4dbc7ad29 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0072.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0072.png
index b12a83c91..b12a83c91 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/trinity.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/trinity.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/gear.3ds b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/gear.3ds
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/gear.3ds
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/window-decoration-gradient-inactive.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/window-decoration-gradient-inactive.png
index 68d188519..68d188519 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/window-decoration-gradient-inactive.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/window-decoration-gradient-inactive.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/window-decoration-gradient.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/window-decoration-gradient.png
index a92934329..a92934329 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/window-decoration-gradient.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/window-decoration-gradient.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/backgroundrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/backgroundrc
index abd9c21e5..abd9c21e5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/backgroundrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/backgroundrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/colour-schemes/kubuntuColours.kcsrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/colour-schemes/kubuntuColours.kcsrc
index e4ed11dd7..e4ed11dd7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/colour-schemes/kubuntuColours.kcsrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/colour-schemes/kubuntuColours.kcsrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/00008160000006810000408080010102 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/00008160000006810000408080010102
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/00008160000006810000408080010102
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/00008160000006810000408080010102
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
index 93787b425..93787b425 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
index 9390d0633..9390d0633 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
index 93787b425..93787b425 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/X_cursor b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/X_cursor
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/X_cursor
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/X_cursor
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_down b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_down
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_down
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_up b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_up
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/base_arrow_up
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_down b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_down
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_down
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_up b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_up
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/based_arrow_up
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bd_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bd_double_arrow
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bd_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bd_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_left_corner b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_left_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_left_corner
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_left_corner
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_right_corner b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_right_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_right_corner
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_right_corner
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_side b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_side
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/bottom_side
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/center_ptr b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/center_ptr
index 325158011..325158011 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/center_ptr
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/center_ptr
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/circle b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/circle
index 40ce3ce06..40ce3ce06 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/circle
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/circle
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/copy b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/copy
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/copy
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/copy
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross_reverse b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross_reverse
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross_reverse
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/cross_reverse
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/crossed_circle b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/crossed_circle
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/crossed_circle
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/crossed_circle
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/crosshair b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/crosshair
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/crosshair
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/crosshair
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
index 0930af82b..0930af82b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/dot b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/dot
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/dot
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/dot
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/dotbox b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/dotbox
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/dotbox
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/dotbox
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_large b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_large
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_large
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_large
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_small b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_small
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_small
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draft_small
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draped_box b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draped_box
index 13b748e9f..13b748e9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draped_box
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/draped_box
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fd_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fd_double_arrow
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fd_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fd_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fleur b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fleur
index 9390d0633..9390d0633 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fleur
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/fleur
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/h_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/h_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/h_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand1 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand1
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand1
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand1
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand2 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand2
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand2
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/hand2
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr_watch b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr_watch
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr_watch
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_ptr_watch
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_side b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_side
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/left_side
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/link b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/link
index 93787b425..93787b425 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/link
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/link
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/ll_angle b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/ll_angle
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/ll_angle
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/ll_angle
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/lr_angle b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/lr_angle
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/lr_angle
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/lr_angle
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/move b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/move
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/move
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/move
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/pencil b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/pencil
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/pencil
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/pencil
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/pirate b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/pirate
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/pirate
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/pirate
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/plus b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/plus
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/plus
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/plus
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/question_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/question_arrow
index 0930af82b..0930af82b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/question_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/question_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_ptr b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_ptr
index 47742d40e..47742d40e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_ptr
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_ptr
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_side b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_side
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/right_side
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_down_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_down_arrow
index a3743a37e..a3743a37e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_down_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_down_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_h_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_h_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_h_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_left_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_left_arrow
index b12f2f5c0..b12f2f5c0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_left_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_left_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_right_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_right_arrow
index 79fda1d7b..79fda1d7b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_right_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_right_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_up_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_up_arrow
index 325158011..325158011 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_up_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_up_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_v_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_v_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/sb_v_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/tcross b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/tcross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/tcross
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/tcross
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_corner b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_corner
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_left_corner
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_right_corner b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_right_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_right_corner
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_right_corner
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_side b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_side
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/top_side
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/v_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/v_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/v_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/watch b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/watch
index e05fc1230..e05fc1230 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/watch
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/watch
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm
index e9e878124..e9e878124 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm_extra_large b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm_extra_large
index 45c947824..45c947824 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm_extra_large
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/contrastlarge/cursors/xterm_extra_large
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/index.theme b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/index.theme
index b4ad00443..b4ad00443 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/cursors/index.theme
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/cursors/index.theme
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/changelog b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/changelog
index 7e7d95cd6..7e7d95cd6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/changelog
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/changelog
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/compat b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/compat
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/compat
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/control
index 42eda71d3..42eda71d3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/control
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/copyright b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/copyright
index da861bc89..da861bc89 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/copyright
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/copyright
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/dirs b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/dirs
index a26044f48..a26044f48 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/dirs
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/dirs
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/.gitignore b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/distrospecific/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/.gitignore
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/distrospecific/.gitignore
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
index a4b1c7bba..a4b1c7bba 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
index 2cbdac854..2cbdac854 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postrm
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/rules b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/rules
index b6386b0d8..b6386b0d8 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/rules
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/rules
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/source/format b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/source/format
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/source/format
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/source/include-binaries b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/source/include-binaries
index 3155a27da..3155a27da 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/source/include-binaries
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/source/include-binaries
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/source/options b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/source/options
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/source/options
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/default-icon-positions/IconPositions b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/default-icon-positions/IconPositions
index 2f8e237b1..2f8e237b1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/default-icon-positions/IconPositions
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/default-icon-positions/IconPositions
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
index b477f5ce2..b477f5ce2 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc
index d8777eae9..d8777eae9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtk_qt_engine_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtkrc-2.0-kde4 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
index e25e89fd4..e25e89fd4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/hal-policy-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal-policy-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/hal-policy-ntfs-config-write-policy.fdi
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen.svg
index 1c35cfed6..1c35cfed6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen128.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen128.png
index 7b3588497..7b3588497 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen128.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen128.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen64.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen64.png
index 068a38680..068a38680 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen64.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kaffeine/fileopen64.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kaffeine/wizard_stamp_v0.7.1 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kaffeine/wizard_stamp_v0.7.1
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kaffeine/wizard_stamp_v0.7.1
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kaffeine/wizard_stamp_v0.7.1
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-hidden/directory-home b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-hidden/directory-home
index 519a93d87..519a93d87 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-hidden/directory-home
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-hidden/directory-home
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-hidden/directory-media b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-hidden/directory-media
index 3fba6cec6..3fba6cec6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-hidden/directory-media
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-hidden/directory-media
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-hidden/hidden-media b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-hidden/hidden-media
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-hidden/hidden-media
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/adept_managerrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/adept_managerrc
index 3e7f7533d..3e7f7533d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/adept_managerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/adept_managerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/adept_notifierrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/adept_notifierrc
index 86c6056ec..86c6056ec 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/adept_notifierrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/adept_notifierrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/amarokrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/amarokrc
index b02ab8b29..b02ab8b29 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/amarokrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/amarokrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/arkrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/arkrc
index 1b3188cb8..1b3188cb8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/arkrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/arkrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/clock_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/clock_panelapplet_kubuntu_rc
index 60167c5dd..60167c5dd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/clock_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/clock_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/cryptodefaults b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/cryptodefaults
index cae93fc63..cae93fc63 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/cryptodefaults
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/d3lphinrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/d3lphinrc
index 93e4bc082..93e4bc082 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/d3lphinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/d3lphinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/gtkrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/gtkrc
index a8c3bb15b..a8c3bb15b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/gtkrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/gtkrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/gtkrc-2.0 b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/gtkrc-2.0
index ed38dfa2d..ed38dfa2d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/gtkrc-2.0
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/gtkrc-2.0
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/k3b.eventsrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/k3b.eventsrc
index 3eb68c158..3eb68c158 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/k3b.eventsrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/k3b.eventsrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/k3brc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/k3brc
index 177e2c957..177e2c957 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/k3brc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/k3brc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kaffeinerc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kaffeinerc
index 01a8e675c..01a8e675c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kaffeinerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kaffeinerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katapultrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/katapultrc
index d0a51f357..d0a51f357 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katapultrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/katapultrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc
index f952dff62..f952dff62 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/katerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kbookmarkrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kbookmarkrc
index d70bd649f..d70bd649f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kbookmarkrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kbookmarkrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcminputrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcminputrc
index e007097a0..e007097a0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcminputrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmlaptoprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmlaptoprc
index b1c36c638..b1c36c638 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmlaptoprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmlaptoprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
index a44667033..a44667033 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcookiejarrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdeglobals b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdeglobals
index 250274182..250274182 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdesktoprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdesktoprc
index 7534ece0e..7534ece0e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kgpgrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kgpgrc
index 9aae01a60..9aae01a60 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kgpgrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kgpgrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/khelpcenterrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/khelpcenterrc
index c4d1f4dac..c4d1f4dac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/khelpcenterrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/khelpcenterrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kickerrc
index 5ca07ccbc..5ca07ccbc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/klipperrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/klipperrc
index 2819a62cd..2819a62cd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/klipperrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/klipperrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmailrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmailrc
index 07151b6a9..07151b6a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmailrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmailrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmixrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmixrc
index d0021119b..d0021119b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmixrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmixrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmplayerrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmplayerrc
index aac3c5721..aac3c5721 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmplayerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kmplayerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/knemorc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/knemorc
index bce3ab226..bce3ab226 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/knemorc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/knemorc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/knotesrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/knotesrc
index befc44ca5..befc44ca5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/knotesrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/knotesrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/knotify.eventsrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/knotify.eventsrc
index 8d57ed914..8d57ed914 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/knotify.eventsrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/knotify.eventsrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/konqiconviewrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/konqiconviewrc
index 5510f2ce4..5510f2ce4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/konqiconviewrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/konqiconviewrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/konquerorrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/konquerorrc
index 25dc7ab4e..25dc7ab4e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/konquerorrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/konquerorrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/konsolerc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/konsolerc
index 9a30085cc..9a30085cc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/konsolerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/konsolerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kontactrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kontactrc
index a783507e2..a783507e2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kontactrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kontactrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/konversationrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/konversationrc
index 821eb3d25..821eb3d25 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/konversationrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/konversationrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kopeterc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kopeterc
index 6efe0ad0d..6efe0ad0d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kopeterc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kopeterc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/korgacrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/korgacrc
index f948d8c13..f948d8c13 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/korgacrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/korgacrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kscdrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kscdrc
index f552f8381..f552f8381 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kscdrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kscdrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/ksplashrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/ksplashrc
index 80b4ea864..80b4ea864 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/ksplashrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/ksplashrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/ktaskbarrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/ktaskbarrc
index cc6c1d8bf..cc6c1d8bf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/ktaskbarrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/ktaskbarrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/ktiprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/ktiprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/ktiprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kuriikwsfilterrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kuriikwsfilterrc
index 5609ef964..5609ef964 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kuriikwsfilterrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kuriikwsfilterrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kuserrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kuserrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kuserrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc
index 194732832..194732832 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/launcher_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/metabarrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/metabarrc
index 6ade29f07..6ade29f07 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/metabarrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/metabarrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/minipager_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/minipager_panelapplet_kubuntu_rc
index 4a507a9f7..4a507a9f7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/minipager_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/minipager_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/profilerc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/profilerc
index 321d12cef..321d12cef 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/profilerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/profilerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/skimrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/skimrc
index 63381ac76..63381ac76 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/skimrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/skimrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/startupconfig b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/startupconfig
index abd9ea20e..abd9ea20e 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/startupconfig
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/startupconfig
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/systemtray_panelappletrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/systemtray_panelappletrc
index ccf383453..ccf383453 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/systemtray_panelappletrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/systemtray_panelappletrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/taskbar_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/taskbar_panelapplet_kubuntu_rc
index 8d1c8b69c..8d1c8b69c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/taskbar_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/taskbar_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdehtmlrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdeio_httprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdelaunchrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdelaunchrc
index 1ca985896..1ca985896 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdelaunchrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdelaunchrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdewalletrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdewalletrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc
index e86bdc2e0..e86bdc2e0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/twinrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/twinrc
index e5690cb5b..e5690cb5b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/twinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/twinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/uiserver b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/uiserver
index 932d73471..932d73471 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/uiserver
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/uiserver
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/yakuakerc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/yakuakerc
index 14d4a035f..14d4a035f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/yakuakerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/yakuakerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/CHANGELOG b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/CHANGELOG
index 028c9fc89..028c9fc89 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/CHANGELOG
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/CHANGELOG
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/INSTALL b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/INSTALL
index ea8a37692..ea8a37692 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/INSTALL
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/INSTALL
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/LICENSE b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/LICENSE
index d64d3ac80..d64d3ac80 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/LICENSE
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/LICENSE
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/colors b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/colors
index ac65ca342..ac65ca342 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/colors
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/colors
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/background.svg
index 5d8290a23..5d8290a23 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
index c5f9a5034..c5f9a5034 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/elementbgnormal.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
index 3eea0423a..3eea0423a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/raptorslide.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/raptorslide.svg
index 6a2fefb14..6a2fefb14 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/raptorslide.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/menu/raptorslide.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/down.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/down.svg
index 16f1f4199..16f1f4199 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/down.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/down.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/up.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/up.svg
index 7162e9353..7162e9353 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/up.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/news/up.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/opaque/dialogs/background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
index d68a79acd..d68a79acd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
index 412b3d684..412b3d684 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
index 3b947f614..3b947f614 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/theme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/theme.desktop
index 334a3db9a..334a3db9a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/theme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/theme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/akonadi.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/akonadi.svg
index a3c18d3e3..a3c18d3e3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/akonadi.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/akonadi.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/analog_meter.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/analog_meter.svg
index 8e9fa9a35..8e9fa9a35 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/analog_meter.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/analog_meter.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/background.svg
index dabb94e48..dabb94e48 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
index d83b884a2..d83b884a2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
index ec5abce8b..ec5abce8b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
index 967f4ed74..967f4ed74 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery.svg
index a8ab672f5..a8ab672f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/battery.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/clock.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/clock.svg
index fc9b79f56..fc9b79f56 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/clock.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/clock.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/connection-established.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/connection-established.svg
index 92e8fee60..92e8fee60 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/connection-established.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/connection-established.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/greenarrow.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/greenarrow.svg
index ac63dd7c3..ac63dd7c3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/greenarrow.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/greenarrow.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/iconbutton.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/iconbutton.svg
index c0bc6aa0c..c0bc6aa0c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/iconbutton.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/iconbutton.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/kget.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/kget.svg
index 2afb85ea0..2afb85ea0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/kget.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/kget.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/luna.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/luna.svg
index 44b5a068d..44b5a068d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/luna.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/luna.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/network_traffic.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/network_traffic.svg
index 8adb0a1cf..8adb0a1cf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/network_traffic.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/network_traffic.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/notes.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/notes.svg
index 5279d6a4f..5279d6a4f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/notes.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/notes.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/panel-background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/panel-background.svg
index 33c56b2bd..33c56b2bd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/panel-background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/panel-background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
index 201ac63e5..201ac63e5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/plot-background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/plot-background.svg
index de8d36599..de8d36599 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/plot-background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/plot-background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/tiger.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/tiger.svg
index 983e57026..983e57026 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/tiger.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/tiger.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/toolbox-button.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
index c3158d60d..c3158d60d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/train-clock.svg b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/train-clock.svg
index 6765b03de..6765b03de 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/train-clock.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/artwork/desktoptheme/widgets/train-clock.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/directory-home b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/directory-home
index 2e7cb00ab..2e7cb00ab 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/directory-home
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/directory-home
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/directory-media b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/directory-media
index 303a02046..303a02046 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/directory-media
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/directory-media
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/hidden-media b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/hidden-media
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-hidden/hidden-media
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/TODO-plasma-appletsrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/TODO-plasma-appletsrc
index dde841be5..dde841be5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/TODO-plasma-appletsrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/TODO-plasma-appletsrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/cryptodefaults b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/cryptodefaults
index 837e3aa07..837e3aa07 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/cryptodefaults
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/dolphinrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/dolphinrc
index 684474d37..684474d37 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/dolphinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/dolphinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/katerc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/katerc
index be120de43..be120de43 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/katerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/katerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcminputrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcminputrc
index b2fee2a64..b2fee2a64 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcminputrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
index dcb6cd6ac..dcb6cd6ac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcookiejarrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kdeglobals b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kdeglobals
index e02c15643..e02c15643 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kmixrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kmixrc
index 8c6888651..8c6888651 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kmixrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kmixrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/ktiprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/ktiprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/ktiprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kuserrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kuserrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kuserrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwinrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwinrc
index 8f06aef78..8f06aef78 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdewalletrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/keyboard-rc-files/win-key.sh b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/keyboard-rc-files/win-key.sh
index d28fa8be7..d28fa8be7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/keyboard-rc-files/win-key.sh
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/keyboard-rc-files/win-key.sh
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kickerrc
index 2bf2fd34b..2bf2fd34b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kompmgr-rc-files/compton-tde.conf b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kompmgr-rc-files/compton-tde.conf
index 26c725969..26c725969 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kompmgr-rc-files/compton-tde.conf
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kompmgr-rc-files/compton-tde.conf
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kompmgr-rc-files/xcompmgrrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kompmgr-rc-files/xcompmgrrc
index 9c9b9ff17..9c9b9ff17 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kompmgr-rc-files/xcompmgrrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kompmgr-rc-files/xcompmgrrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/konqueror-profile/konq_plugins.xml b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/konqueror-profile/konq_plugins.xml
index 1df24cc92..1df24cc92 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/konqueror-profile/konq_plugins.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/konqueror-profile/konq_plugins.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-plugins/dirfilterplugin.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-plugins/dirfilterplugin.rc
index cb7bb0081..cb7bb0081 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-plugins/dirfilterplugin.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-plugins/dirfilterplugin.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc
index a45167843..a45167843 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc
index df2c4f29f..df2c4f29f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ark_part_readonly.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/gvimagepart.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/gvimagepart.rc
index 5e0cdf11a..5e0cdf11a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/gvimagepart.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/gvimagepart.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ksvgplugin.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ksvgplugin.rc
index abf3537d7..abf3537d7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ksvgplugin.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/ksvgplugin.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/part.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/part.rc
index e7ecb2f3d..e7ecb2f3d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/part.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/part.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc
index 069870b55..069870b55 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/tdehtml_browser.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-7z.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-7z.desktop
index 66083b4a0..66083b4a0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-7z.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-7z.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-ace.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-ace.desktop
index 9d2484d2c..9d2484d2c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-ace.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-ace.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-arc.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-arc.desktop
index 0481ebb03..0481ebb03 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-arc.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-arc.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-archive.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-archive.desktop
index e68c7767b..e68c7767b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-archive.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-archive.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-arj.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-arj.desktop
index b139ae430..b139ae430 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-arj.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-arj.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-bzip.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-bzip.desktop
index 3e4a5ae35..3e4a5ae35 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-bzip.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-bzip.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-bzip2.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-bzip2.desktop
index 1e374ca30..1e374ca30 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-bzip2.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-bzip2.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-compress.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-compress.desktop
index caa974dda..caa974dda 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-compress.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-compress.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-cpio.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-cpio.desktop
index 028584be7..028584be7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-cpio.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-cpio.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-gzip.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-gzip.desktop
index 1fcb83b99..1fcb83b99 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-gzip.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-gzip.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-lha.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-lha.desktop
index 6d14dc9ec..6d14dc9ec 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-lha.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-lha.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-lzop.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-lzop.desktop
index eaea7533f..eaea7533f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-lzop.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-lzop.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-pak.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-pak.desktop
index 6bb24c32d..6bb24c32d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-pak.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-pak.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-rar.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-rar.desktop
index 6d8f0695f..6d8f0695f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-rar.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-rar.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tar.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tar.desktop
index bf9778f53..bf9778f53 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tar.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tar.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tarz.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tarz.desktop
index b1e44f1f5..b1e44f1f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tarz.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tarz.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tbz.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tbz.desktop
index c01f6296c..c01f6296c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tbz.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tbz.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tgz.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tgz.desktop
index 9c0264556..9c0264556 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tgz.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tgz.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tzo.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tzo.desktop
index 57d65bfff..57d65bfff 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-tzo.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-tzo.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-zip.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-zip.desktop
index 8c4a6d075..8c4a6d075 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-zip.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-zip.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-zoo.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-zoo.desktop
index b1ce82a51..b1ce82a51 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/mimelnk/x-zoo.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/mimelnk/x-zoo.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/qt-rc-files/kstylerc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/qt-rc-files/kstylerc
index 4d1d76779..4d1d76779 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/qt-rc-files/kstylerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/qt-rc-files/kstylerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/qt-rc-files/lipstikstylerc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/qt-rc-files/lipstikstylerc
index c1c892daa..c1c892daa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/qt-rc-files/lipstikstylerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/qt-rc-files/lipstikstylerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/qt-rc-files/polyesterstylerc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/qt-rc-files/polyesterstylerc
index 8526d4fa6..8526d4fa6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/qt-rc-files/polyesterstylerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/qt-rc-files/polyesterstylerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/kde4rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tde-profile/kde4rc
index 454fa83f3..454fa83f3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/kde4rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tde-profile/kde4rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/tde-user-profile b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/tde-user-profile
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tde-profile/tde-user-profile
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/tderc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tde-profile/tderc
index 2b0f2b913..2b0f2b913 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/tderc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tde-profile/tderc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdewallet-default-wallet/tdewallet.kwl b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tdewallet-default-wallet/tdewallet.kwl
index 485b2e683..485b2e683 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdewallet-default-wallet/tdewallet.kwl
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tdewallet-default-wallet/tdewallet.kwl
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tdmdistrc
index 4b0721fd3..4b0721fd3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/tdmdistrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/ui-rc-files/gwenviewui.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/ui-rc-files/gwenviewui.rc
index 3a7b72ba4..3a7b72ba4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/ui-rc-files/gwenviewui.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/ui-rc-files/gwenviewui.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/ui-rc-files/konqueror.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/ui-rc-files/konqueror.rc
index cab74b6e5..cab74b6e5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/ui-rc-files/konqueror.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/ui-rc-files/konqueror.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/ui-rc-files/kopetechatwindow.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/ui-rc-files/kopetechatwindow.rc
index 56b534b10..56b534b10 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/ui-rc-files/kopetechatwindow.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/ui-rc-files/kopetechatwindow.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile b/ubuntu/_base/defaultsettings/redmond-default-settings/Makefile
index a83a8de3f..a83a8de3f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/Makefile
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kdeglobals b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kdeglobals
index 9c975c1cd..9c975c1cd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kdeglobals
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kdesktoprc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
index d169791dc..d169791dc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/konquerorrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/konquerorrc
index 8a3b98da1..8a3b98da1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/konquerorrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/konquerorrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/ksmserverrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
index 9f757e982..9f757e982 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/ksmserverrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kwinrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kwinrc
index 3f17db0cc..3f17db0cc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kwinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/kwinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100 b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
index f23049399..f23049399 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/lesser-visual-impairment/session/kmag_deadbeef96000111065458100000063760027_1110891555_426100
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kaccessrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kaccessrc
index 30b66b640..30b66b640 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kaccessrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kaccessrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kcminputrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kcminputrc
index da0aed512..da0aed512 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kcminputrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kcminputrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kickerrc
index 30780e137..30780e137 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/ksmserverrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
index db7d79686..db7d79686 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/ksmserverrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kvkbdrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
index e87700ebf..e87700ebf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/minor-motor-difficulties/kvkbdrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kdeglobals b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kdeglobals
index d636dd0c4..d636dd0c4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kdeglobals
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kdesktoprc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
index ac89fb28a..ac89fb28a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kickerrc
index 1fe1aebaa..1fe1aebaa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/konquerorrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/konquerorrc
index 516543fbe..516543fbe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/konquerorrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/konquerorrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kwinrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kwinrc
index 6a82a4eb1..6a82a4eb1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kwinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/moderate-visual-impairment/kwinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
index 82767e58c..82767e58c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/kmousetoolrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
index 067e50c3f..067e50c3f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/accessibility/motor-difficulties-pointing-devices/ksmserverrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/background.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/amarok/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/background.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/amarok/background.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/head.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/amarok/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/head.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/amarok/head.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/stylesheet.css b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/amarok/stylesheet.css
index 6bf2ded5c..6bf2ded5c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/amarok/stylesheet.css
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/amarok/stylesheet.css
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/edgyWallpaper.tar.gz b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/edgyWallpaper.tar.gz
index f100041c8..f100041c8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/edgyWallpaper.tar.gz
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/edgyWallpaper.tar.gz
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/enterprise-desktop.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/enterprise-desktop.png
index 4b1f883f4..4b1f883f4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/enterprise-desktop.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/enterprise-desktop.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
index 4035e27f7..4035e27f7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
index a57917b8f..a57917b8f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
index e1a2648ef..e1a2648ef 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
index 7ed5de679..7ed5de679 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
index c1c8ed284..c1c8ed284 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
index 052defc97..052defc97 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Blue_Curl/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
index 79c19f6aa..79c19f6aa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
index 62a48fd3c..62a48fd3c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
index f69fd57b3..f69fd57b3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
index 18efbfac8..18efbfac8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
index 3b7723190..3b7723190 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
index 439b94c30..439b94c30 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Code_Poets_Dream/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
index 4eb7120af..4eb7120af 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
index 911dfe880..911dfe880 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
index 70a2419bf..70a2419bf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
index 29fe66b86..29fe66b86 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
index c24c5f25a..c24c5f25a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
index 5d5cd8f7a..5d5cd8f7a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Colorado_Farm/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
index f379812ae..f379812ae 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
index d877af31f..d877af31f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
index 457eb7c30..457eb7c30 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
index e178dbc96..e178dbc96 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
index 4e6ba5f0d..4e6ba5f0d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
index 6eb18effe..6eb18effe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Curls_on_Green/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1024x768.jpg
index 7a598f8fa..7a598f8fa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
index 21f1db0a9..21f1db0a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x800.jpg
index 3f775c120..3f775c120 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1440x900.jpg
index 127636b9c..127636b9c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
index 535b5a960..535b5a960 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
index 6a96381e8..6a96381e8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/EOS/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
index 7e3b5c237..7e3b5c237 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
index 3cbc9d021..3cbc9d021 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
index 66d8724a9..66d8724a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
index 1553e7ede..1553e7ede 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
index 05707f46b..05707f46b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
index 0eeb356d1..0eeb356d1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Emotion/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
index 53dfbe91b..53dfbe91b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
index 9ae3f39bd..9ae3f39bd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
index 4bb9e4776..4bb9e4776 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
index 2f625a0d5..2f625a0d5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
index b38ee6b2a..b38ee6b2a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
index 480dfacfc..480dfacfc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fields_of_Peace/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
index 651c1dfc5..651c1dfc5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
index 2815769b7..2815769b7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
index dd11781b1..dd11781b1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
index f2d724ef7..f2d724ef7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
index 4e67b2a90..4e67b2a90 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
index 07337d9d5..07337d9d5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Finally_Summer_in_Germany/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
index 699fc1e92..699fc1e92 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
index 0f82327b5..0f82327b5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
index 7300ba787..7300ba787 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
index b3227967a..b3227967a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
index 46d47ff57..46d47ff57 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
index 08c0d35ce..08c0d35ce 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Flower_drops/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
index e8834b503..e8834b503 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
index 99b6d84d7..99b6d84d7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
index bcfeb457c..bcfeb457c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
index cd3b16311..cd3b16311 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
index e3bc89bd9..e3bc89bd9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
index 81cac6f6d..81cac6f6d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Fresh_Morning/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
index 12ecd19df..12ecd19df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
index 1bf5576c1..1bf5576c1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
index d4a8a695a..d4a8a695a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
index af08bfd29..af08bfd29 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
index 7cbaf7f39..7cbaf7f39 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
index 30234263f..30234263f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Golden_Ripples/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
index 631b5297b..631b5297b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
index a0e458ce3..a0e458ce3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
index 25c677bbd..25c677bbd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
index a1fa8d5bb..a1fa8d5bb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
index 701db348c..701db348c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
index dd8319f19..dd8319f19 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Green_Concentration/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
index 00fe97041..00fe97041 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
index 9fc47822e..9fc47822e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
index e3d0db71e..e3d0db71e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
index bb4e1fa6a..bb4e1fa6a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
index e2dbb6eb9..e2dbb6eb9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
index 516440ff0..516440ff0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Ladybuggin/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
index c80e146fc..c80e146fc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
index 2d770f592..2d770f592 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
index 59c3fc3ab..59c3fc3ab 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
index c10cddd17..c10cddd17 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
index c1dda4800..c1dda4800 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
index 6d1986090..6d1986090 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Leafs_Labyrinth/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
index 454750639..454750639 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
index 75bf53846..75bf53846 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
index 47ead04aa..47ead04aa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
index bb1253f3f..bb1253f3f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
index aea4f9fc8..aea4f9fc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
index 404004c19..404004c19 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Red_Leaf/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
index 0f7d98144..0f7d98144 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
index 37d0f2015..37d0f2015 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
index a8a1ec58f..a8a1ec58f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
index 7b1673249..7b1673249 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
index eeafc3e93..eeafc3e93 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
index dc835d4d3..dc835d4d3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Skeeter_Hawk/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
index 1f46d48b7..1f46d48b7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
index d2322d955..d2322d955 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
index b08244f2d..b08244f2d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
index 7cec0df71..7cec0df71 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
index bf2d55534..bf2d55534 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
index f4e905f77..f4e905f77 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/There_is_Rain_on_the_Table/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
index a6cc84cd2..a6cc84cd2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1024x768.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
index 8bb7904c6..8bb7904c6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x1024.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
index 6b92df4c9..6b92df4c9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1280x800.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
index 295544140..295544140 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1440x900.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
index 6296ebb49..6296ebb49 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1600x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
index cfd571d31..cfd571d31 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/intrepid_wallpapers/Vector_Sunset/1920x1200.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/index.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/index.desktop
index 4159027ea..4159027ea 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/index.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/index.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_admin.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_admin.png
index 89120c90f..89120c90f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_admin.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_admin.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_away.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_away.png
index 897801f62..897801f62 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_away.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_away.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_halfop.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_halfop.png
index c6189edf6..c6189edf6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_halfop.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_halfop.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_normal.png
index 813f8d70e..813f8d70e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_op.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_op.png
index 1667de67e..1667de67e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_op.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_op.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_owner.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_owner.png
index 7df96f8c9..7df96f8c9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_owner.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_owner.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_voice.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_voice.png
index e4f9f41a5..e4f9f41a5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/konversation/irc_voice.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/konversation/irc_voice.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/Dialog.png
index 84a8c8a13..84a8c8a13 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/Preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/Preview.png
index 09655c689..09655c689 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/Preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/Preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/ReadMe.txt b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/ReadMe.txt
index 3c7d9763d..3c7d9763d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/ReadMe.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/ReadMe.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/Theme.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/Theme.rc
index d0bd905c5..d0bd905c5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/Theme.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/Theme.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/ksplash/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/ksplash/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-hardy-wallpaper.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
index a42ebde69..a42ebde69 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-hardy-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
index 052defc97..052defc97 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-intrepid-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
index be7e79b60..be7e79b60 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-jaunty-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-kmenu-side-tile.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-kmenu-side-tile.png
index 220310005..220310005 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-kmenu-side-tile.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-kmenu-side-tile.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-kmenu-side.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-kmenu-side.png
index 84cc1343e..84cc1343e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-kmenu-side.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-kmenu-side.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-konqueror-background-classic.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-konqueror-background-classic.png
index f11dfa17b..f11dfa17b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-konqueror-background-classic.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-konqueror-background-classic.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-konqueror-background.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-konqueror-background.png
index 5be2c9e2a..5be2c9e2a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-konqueror-background.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-konqueror-background.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-login.ogg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-login.ogg
index 349c13f15..349c13f15 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-login.ogg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-login.ogg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-lucid-wallpaper.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-lucid-wallpaper.jpg
index c24aead02..c24aead02 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-lucid-wallpaper.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-lucid-wallpaper.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-panel.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-panel.png
index 8f01995da..8f01995da 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-panel.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-panel.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper-alternate.jpg b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper-alternate.jpg
index e62d362e3..e62d362e3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper-alternate.jpg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper-alternate.jpg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper.png
index 5edd07e8b..5edd07e8b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper.png.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper.png.desktop
index 3f755fe75..3f755fe75 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper.png.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kubuntu-wallpaper.png.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/metabar/background.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/metabar/background.png
index d693020b9..d693020b9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/metabar/background.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/metabar/background.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/metabar/default.css b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/metabar/default.css
index c8da33422..c8da33422 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/metabar/default.css
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/metabar/default.css
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/metabar/head.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/metabar/head.png
index c222a2a23..c222a2a23 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/metabar/head.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/metabar/head.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/metabar/layout.html b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/metabar/layout.html
index 92669de64..92669de64 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/metabar/layout.html
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/metabar/layout.html
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/Dialog.png
index 801c4882a..801c4882a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
index d1507f55f..d1507f55f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/kubuntu.xml b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/kubuntu.xml
index 5f0fb8bf6..5f0fb8bf6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme-no-userlist/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/Dialog.png
index 4ad6c8ab4..4ad6c8ab4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
index dcbca7a27..dcbca7a27 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/kubuntu.xml b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/kubuntu.xml
index 5d1c437da..5d1c437da 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/tdm-theme/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0001.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0001.png
index 2511fe958..2511fe958 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0002.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0002.png
index 437dbb652..437dbb652 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0003.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0003.png
index 757a84acd..757a84acd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0004.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0004.png
index f50f9fb9c..f50f9fb9c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0005.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0005.png
index 5b2838708..5b2838708 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0006.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0006.png
index f9f09e15f..f9f09e15f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0007.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0007.png
index 71a89d7b8..71a89d7b8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0008.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0008.png
index 2ada75115..2ada75115 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0009.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0009.png
index 57dabb733..57dabb733 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0010.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0010.png
index 1f9e457d9..1f9e457d9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0011.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0011.png
index a184e2a81..a184e2a81 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0012.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0012.png
index 7bebbe7b1..7bebbe7b1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0013.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0013.png
index 7062df661..7062df661 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0014.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0014.png
index 8ff603dcd..8ff603dcd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0015.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0015.png
index 84cd48dd9..84cd48dd9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0016.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0016.png
index 0e07dfcff..0e07dfcff 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0017.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0017.png
index ef20e4107..ef20e4107 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0018.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0018.png
index 10ac1f14f..10ac1f14f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0019.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0019.png
index 3dbca061e..3dbca061e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0020.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0020.png
index d5bcca606..d5bcca606 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0021.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0021.png
index fe8dfe828..fe8dfe828 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0022.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0022.png
index 309d39506..309d39506 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0023.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0023.png
index 45f493385..45f493385 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0024.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0024.png
index 3b1f4b62b..3b1f4b62b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0025.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0025.png
index 2a7569bb9..2a7569bb9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0026.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0026.png
index 60a2d9a4b..60a2d9a4b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0027.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0027.png
index 57d8ddf90..57d8ddf90 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0028.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0028.png
index 07f6f6442..07f6f6442 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0029.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0029.png
index 1a7f87398..1a7f87398 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0030.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0030.png
index db3700633..db3700633 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0031.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0031.png
index 5bc157309..5bc157309 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0032.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0032.png
index 5ba70fe7e..5ba70fe7e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0033.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0033.png
index a97437d41..a97437d41 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0034.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0034.png
index 363bb34bc..363bb34bc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0035.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0035.png
index 971bf0547..971bf0547 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0036.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0036.png
index f3c0b17d4..f3c0b17d4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0037.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0037.png
index c305d3548..c305d3548 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0038.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0038.png
index ea578703e..ea578703e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0039.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0039.png
index 4c9888fc1..4c9888fc1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0040.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0040.png
index 0b753ff8d..0b753ff8d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0041.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0041.png
index 706f08d66..706f08d66 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0042.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0042.png
index 776ef28ce..776ef28ce 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0043.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0043.png
index 381e49bbf..381e49bbf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0044.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0044.png
index 6e7eeb9e4..6e7eeb9e4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0045.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0045.png
index 4ba9a2d8d..4ba9a2d8d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0046.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0046.png
index d1e7fc959..d1e7fc959 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0047.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0047.png
index ceffb05ac..ceffb05ac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0048.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0048.png
index bf0dd17e9..bf0dd17e9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0049.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0049.png
index 1eed36bcd..1eed36bcd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0050.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0050.png
index 6537b166c..6537b166c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0051.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0051.png
index 95e75617b..95e75617b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0052.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0052.png
index 5fbb023b6..5fbb023b6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0053.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0053.png
index 187639e22..187639e22 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0054.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0054.png
index f4fde2f12..f4fde2f12 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0055.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0055.png
index 8b1d48c4b..8b1d48c4b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0056.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0056.png
index bfe7141fa..bfe7141fa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0057.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0057.png
index c16c862d6..c16c862d6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0058.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0058.png
index 00755b7f8..00755b7f8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0059.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0059.png
index 58d49bf28..58d49bf28 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0060.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0060.png
index 6f29bb960..6f29bb960 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0061.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0061.png
index 399da3623..399da3623 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0062.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0062.png
index 3901d3fa3..3901d3fa3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0063.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0063.png
index 146f4d92a..146f4d92a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0064.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0064.png
index f624dfad7..f624dfad7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0065.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0065.png
index 80d9750a8..80d9750a8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0066.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0066.png
index 6862242fa..6862242fa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0067.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0067.png
index 21969eadd..21969eadd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0068.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0068.png
index 93450476f..93450476f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0069.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0069.png
index 8d82bd420..8d82bd420 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0070.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0070.png
index 9c952753f..9c952753f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0071.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0071.png
index afe03e426..afe03e426 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0072.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0072.png
index c5898d2f5..c5898d2f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/trinity.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/trinity.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0001.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0001.png
index 4cc0e63d7..4cc0e63d7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0002.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0002.png
index 47ffe7f5c..47ffe7f5c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0003.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0003.png
index 9c430f17c..9c430f17c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0004.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0004.png
index ce1b601d3..ce1b601d3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0005.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0005.png
index 0f2733484..0f2733484 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0006.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0006.png
index 3a43431e6..3a43431e6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0007.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0007.png
index 0def9ab08..0def9ab08 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0008.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0008.png
index 8cdafa67d..8cdafa67d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0009.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0009.png
index fec427b1c..fec427b1c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0010.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0010.png
index c6ee79918..c6ee79918 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0011.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0011.png
index 32ae2c278..32ae2c278 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0012.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0012.png
index 149a2d531..149a2d531 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0013.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0013.png
index 11653ec2d..11653ec2d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0014.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0014.png
index 62273288d..62273288d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0015.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0015.png
index ef7e67a39..ef7e67a39 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0016.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0016.png
index 4d1be5429..4d1be5429 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0017.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0017.png
index ace88c61e..ace88c61e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0018.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0018.png
index d0ef10a39..d0ef10a39 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0019.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0019.png
index 6fcef2451..6fcef2451 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0020.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0020.png
index b8989d91f..b8989d91f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0021.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0021.png
index bdc715c2c..bdc715c2c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0022.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0022.png
index 03175be99..03175be99 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0023.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0023.png
index d83ca0abe..d83ca0abe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0024.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0024.png
index 27b5a1919..27b5a1919 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0025.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0025.png
index e09ed2d62..e09ed2d62 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0026.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0026.png
index cd5b5159c..cd5b5159c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0027.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0027.png
index 58f206dc4..58f206dc4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0028.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0028.png
index b6bf8b6c9..b6bf8b6c9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0029.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0029.png
index 9be1150d0..9be1150d0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0030.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0030.png
index 053725cd7..053725cd7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0031.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0031.png
index de901a6d5..de901a6d5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0032.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0032.png
index 1a6cd96ee..1a6cd96ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0033.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0033.png
index 7b9c8d9b3..7b9c8d9b3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0034.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0034.png
index aaa6ab85d..aaa6ab85d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0035.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0035.png
index f3623b582..f3623b582 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0036.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0036.png
index f90598e2f..f90598e2f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0037.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0037.png
index 813998686..813998686 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0038.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0038.png
index 7dd4c0bdf..7dd4c0bdf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0039.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0039.png
index a3d7cc1a2..a3d7cc1a2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0040.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0040.png
index d8013a42e..d8013a42e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0041.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0041.png
index fe86252a3..fe86252a3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0042.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0042.png
index 97bec2302..97bec2302 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0043.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0043.png
index dbbbeae55..dbbbeae55 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0044.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0044.png
index 517f8f7db..517f8f7db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0045.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0045.png
index 186b984af..186b984af 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0046.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0046.png
index fef65e0fe..fef65e0fe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0047.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0047.png
index 783531512..783531512 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0048.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0048.png
index 5e0f7470c..5e0f7470c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0049.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0049.png
index cabbbafa4..cabbbafa4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0050.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0050.png
index 41c85aad5..41c85aad5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0051.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0051.png
index 0522f3ed1..0522f3ed1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0052.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0052.png
index 580a9d7ac..580a9d7ac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0053.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0053.png
index 3b112d78e..3b112d78e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0054.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0054.png
index ea91b2120..ea91b2120 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0055.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0055.png
index 150138714..150138714 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0056.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0056.png
index e266ce471..e266ce471 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0057.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0057.png
index 5efd497e1..5efd497e1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0058.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0058.png
index 05d4151b7..05d4151b7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0059.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0059.png
index 4945b91e4..4945b91e4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0060.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0060.png
index dcd393d6c..dcd393d6c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0061.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0061.png
index 8448d8c4e..8448d8c4e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0062.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0062.png
index d7d32db65..d7d32db65 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0063.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0063.png
index d7eb095d1..d7eb095d1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0064.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0064.png
index c4fd083b9..c4fd083b9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0065.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0065.png
index c918f5bb1..c918f5bb1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0066.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0066.png
index 4452eca6e..4452eca6e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0067.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0067.png
index c86c6ec94..c86c6ec94 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0068.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0068.png
index 185c03099..185c03099 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0069.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0069.png
index 13c600e53..13c600e53 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0070.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0070.png
index 065932f4a..065932f4a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0071.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0071.png
index 052fe4de9..052fe4de9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0072.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0072.png
index 7d4075c84..7d4075c84 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/trinity.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/trinity.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0001.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0001.png
index 62a4cca7d..62a4cca7d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0002.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0002.png
index 6b5f4f67b..6b5f4f67b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0003.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0003.png
index 16fd732f9..16fd732f9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0004.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0004.png
index c881ab039..c881ab039 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0005.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0005.png
index dc0d437f3..dc0d437f3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0006.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0006.png
index 6fef145a5..6fef145a5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0007.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0007.png
index 3d5325ceb..3d5325ceb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0008.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0008.png
index 22d3b4568..22d3b4568 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0009.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0009.png
index 6c2a1571d..6c2a1571d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0010.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0010.png
index 522e3c267..522e3c267 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0011.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0011.png
index 291ab93a4..291ab93a4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0012.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0012.png
index 71076c54a..71076c54a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0013.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0013.png
index 840996a4e..840996a4e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0014.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0014.png
index a9e144b0c..a9e144b0c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0015.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0015.png
index 018ca12c7..018ca12c7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0016.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0016.png
index 1de98bb5e..1de98bb5e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0017.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0017.png
index dce51b588..dce51b588 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0018.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0018.png
index 71a0674c1..71a0674c1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0019.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0019.png
index 5ac269ce0..5ac269ce0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0020.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0020.png
index e38bf64e1..e38bf64e1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0021.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0021.png
index d1e1bb29d..d1e1bb29d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0022.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0022.png
index e25f1aafe..e25f1aafe 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0023.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0023.png
index 95fde4cbc..95fde4cbc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0024.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0024.png
index 1b4e4285f..1b4e4285f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0025.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0025.png
index bd87a4fb5..bd87a4fb5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0026.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0026.png
index da1b9733e..da1b9733e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0027.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0027.png
index 0d0e6b800..0d0e6b800 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0028.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0028.png
index 6af6790cb..6af6790cb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0029.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0029.png
index debbd8374..debbd8374 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0030.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0030.png
index 4462f08ab..4462f08ab 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0031.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0031.png
index f07043df9..f07043df9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0032.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0032.png
index edc1e5163..edc1e5163 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0033.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0033.png
index 1965bc810..1965bc810 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0034.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0034.png
index d3923cb0b..d3923cb0b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0035.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0035.png
index 411f18c59..411f18c59 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0036.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0036.png
index b3584e637..b3584e637 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0037.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0037.png
index b8064f240..b8064f240 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0038.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0038.png
index 9a27f2cfa..9a27f2cfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0039.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0039.png
index 76156e80a..76156e80a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0040.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0040.png
index 33ac207b7..33ac207b7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0041.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0041.png
index b9fb63587..b9fb63587 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0042.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0042.png
index b1afd00b2..b1afd00b2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0043.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0043.png
index 8f5eee381..8f5eee381 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0044.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0044.png
index c967c52fc..c967c52fc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0045.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0045.png
index 90f6a2123..90f6a2123 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0046.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0046.png
index a9718594e..a9718594e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0047.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0047.png
index 74f707c16..74f707c16 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0048.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0048.png
index 40dfda7fd..40dfda7fd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0049.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0049.png
index d7943ae51..d7943ae51 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0050.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0050.png
index 3e4f2d407..3e4f2d407 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0051.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0051.png
index b1474f149..b1474f149 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0052.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0052.png
index adc09885e..adc09885e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0053.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0053.png
index b24872ab5..b24872ab5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0054.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0054.png
index 4ef2ce2bd..4ef2ce2bd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0055.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0055.png
index bf90f6c1c..bf90f6c1c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0056.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0056.png
index 298db1bb3..298db1bb3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0057.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0057.png
index 0a52acd26..0a52acd26 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0058.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0058.png
index 1283a40f5..1283a40f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0059.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0059.png
index b7eae6a3c..b7eae6a3c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0060.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0060.png
index 562ebba8b..562ebba8b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0061.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0061.png
index 2b194a75f..2b194a75f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0062.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0062.png
index 5981d8cf0..5981d8cf0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0063.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0063.png
index f7949af01..f7949af01 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0064.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0064.png
index 387aeb997..387aeb997 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0065.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0065.png
index ef3eb775f..ef3eb775f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0066.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0066.png
index 3b77d62df..3b77d62df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0067.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0067.png
index ac7f7c554..ac7f7c554 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0068.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0068.png
index 71ee0aaef..71ee0aaef 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0069.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0069.png
index e1670bfaf..e1670bfaf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0070.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0070.png
index 353c7a26a..353c7a26a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0071.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0071.png
index c9ec5e948..c9ec5e948 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0072.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0072.png
index 673327566..673327566 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/trinity.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/trinity.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0001.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0001.png
index 535e3683b..535e3683b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0001.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0001.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0002.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0002.png
index 5718ddd08..5718ddd08 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0002.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0002.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0003.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0003.png
index 1dd5c43e2..1dd5c43e2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0003.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0003.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0004.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0004.png
index d56f02661..d56f02661 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0004.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0004.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0005.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0005.png
index 1a1c4fddc..1a1c4fddc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0005.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0005.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0006.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0006.png
index 64c25672b..64c25672b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0006.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0006.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0007.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0007.png
index 8dcfef3ac..8dcfef3ac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0007.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0007.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0008.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0008.png
index b287d1fd6..b287d1fd6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0008.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0008.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0009.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0009.png
index 2e383c914..2e383c914 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0009.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0009.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0010.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0010.png
index eb57c0498..eb57c0498 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0010.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0010.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0011.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0011.png
index b2dcdba70..b2dcdba70 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0011.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0011.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0012.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0012.png
index bdbbff184..bdbbff184 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0012.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0012.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0013.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0013.png
index c8124b4a6..c8124b4a6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0013.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0013.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0014.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0014.png
index 30d7fda76..30d7fda76 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0014.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0014.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0015.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0015.png
index c8d77e26c..c8d77e26c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0015.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0015.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0016.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0016.png
index 0128c6093..0128c6093 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0016.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0016.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0017.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0017.png
index 15da969b8..15da969b8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0017.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0017.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0018.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0018.png
index 4daea4d9b..4daea4d9b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0018.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0018.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0019.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0019.png
index 4f9eb58a9..4f9eb58a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0019.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0019.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0020.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0020.png
index a3698cdb2..a3698cdb2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0020.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0020.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0021.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0021.png
index ccf07a2a5..ccf07a2a5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0021.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0021.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0022.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0022.png
index 169d10cd4..169d10cd4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0022.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0022.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0023.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0023.png
index 13ff2bbd9..13ff2bbd9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0023.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0023.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0024.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0024.png
index 7614f8b74..7614f8b74 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0024.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0024.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0025.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0025.png
index 0793999e1..0793999e1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0025.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0025.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0026.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0026.png
index 9cafd0fe8..9cafd0fe8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0026.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0026.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0027.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0027.png
index 7ec236984..7ec236984 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0027.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0027.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0028.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0028.png
index c20b8b620..c20b8b620 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0028.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0028.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0029.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0029.png
index ec5eca3df..ec5eca3df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0029.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0029.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0030.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0030.png
index 95dc468f1..95dc468f1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0030.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0030.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0031.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0031.png
index f4631212f..f4631212f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0031.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0031.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0032.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0032.png
index 1ddfce5ba..1ddfce5ba 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0032.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0032.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0033.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0033.png
index 6a97caa09..6a97caa09 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0033.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0033.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0034.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0034.png
index df68a52be..df68a52be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0034.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0034.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0035.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0035.png
index 716cb1c85..716cb1c85 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0035.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0035.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0036.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0036.png
index 2e679d43f..2e679d43f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0036.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0036.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0037.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0037.png
index 29aed6605..29aed6605 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0037.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0037.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0038.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0038.png
index b51a1e3bf..b51a1e3bf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0038.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0038.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0039.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0039.png
index 1023f80ea..1023f80ea 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0039.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0039.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0040.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0040.png
index 12d462b6b..12d462b6b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0040.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0040.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0041.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0041.png
index 94a808810..94a808810 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0041.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0041.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0042.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0042.png
index b9a9d7096..b9a9d7096 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0042.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0042.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0043.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0043.png
index 1b3211aff..1b3211aff 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0043.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0043.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0044.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0044.png
index 674d18aa3..674d18aa3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0044.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0044.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0045.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0045.png
index 154382476..154382476 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0045.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0045.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0046.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0046.png
index 198173cca..198173cca 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0046.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0046.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0047.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0047.png
index 1a90e73dd..1a90e73dd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0047.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0047.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0048.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0048.png
index 6001404d3..6001404d3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0048.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0048.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0049.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0049.png
index 9beab2366..9beab2366 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0049.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0049.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0050.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0050.png
index 2c813649c..2c813649c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0050.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0050.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0051.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0051.png
index 5883cd03e..5883cd03e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0051.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0051.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0052.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0052.png
index d748ecf79..d748ecf79 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0052.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0052.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0053.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0053.png
index 26b83365f..26b83365f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0053.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0053.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0054.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0054.png
index 157d528ed..157d528ed 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0054.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0054.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0055.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0055.png
index bc7b53c0f..bc7b53c0f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0055.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0055.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0056.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0056.png
index 769b688df..769b688df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0056.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0056.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0057.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0057.png
index d3bd110f5..d3bd110f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0057.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0057.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0058.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0058.png
index c1bb44cc6..c1bb44cc6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0058.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0058.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0059.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0059.png
index 3b8058324..3b8058324 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0059.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0059.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0060.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0060.png
index 93c59648c..93c59648c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0060.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0060.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0061.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0061.png
index 1d6b0539c..1d6b0539c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0061.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0061.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0062.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0062.png
index 4b1cf77a9..4b1cf77a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0062.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0062.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0063.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0063.png
index b92d6f697..b92d6f697 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0063.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0063.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0064.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0064.png
index 7541ebca2..7541ebca2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0064.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0064.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0065.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0065.png
index 09f6dc073..09f6dc073 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0065.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0065.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0066.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0066.png
index 370774a34..370774a34 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0066.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0066.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0067.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0067.png
index 5dbb0fb59..5dbb0fb59 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0067.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0067.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0068.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0068.png
index 770d476db..770d476db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0068.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0068.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0069.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0069.png
index 5b3c17be8..5b3c17be8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0069.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0069.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0070.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0070.png
index 84d589923..84d589923 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0070.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0070.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0071.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0071.png
index 4dbc7ad29..4dbc7ad29 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0071.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0071.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0072.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0072.png
index b12a83c91..b12a83c91 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0072.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kubuntu-0072.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/trinity.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/trinity.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/trinity.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/gear.3ds b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/gear.3ds
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/gear.3ds
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/window-decoration-gradient-inactive.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/window-decoration-gradient-inactive.png
index 68d188519..68d188519 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/window-decoration-gradient-inactive.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/window-decoration-gradient-inactive.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/window-decoration-gradient.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/window-decoration-gradient.png
index a92934329..a92934329 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/window-decoration-gradient.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/window-decoration-gradient.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/backgroundrc b/ubuntu/_base/defaultsettings/redmond-default-settings/backgroundrc
index b259365fc..b259365fc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/backgroundrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/backgroundrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/colour-schemes/kubuntuColours.kcsrc b/ubuntu/_base/defaultsettings/redmond-default-settings/colour-schemes/kubuntuColours.kcsrc
index e4ed11dd7..e4ed11dd7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/colour-schemes/kubuntuColours.kcsrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/colour-schemes/kubuntuColours.kcsrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/00008160000006810000408080010102
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/028006030e0e7ebffc7f7070c0600140
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/03b6e0fcb3499374a867c041f52298f0
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/1081e37283d90000800003c07f3ef6bf
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/14fef782d02440884392942c11205230
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/2870a09082c103050810ffdffffe0204
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
index 93787b425..93787b425 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/3085a0e285430894940527032f8b26df
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/3ecb610c1bf2410f44200f48c40d3599
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
index 9390d0633..9390d0633 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/4498f0e0c1937ffe01fd06f973665830
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/6407b0e94181790501fd1e167b474872
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
index 93787b425..93787b425 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/640fb0e74195791501fd1ed57b41487f
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/9081237383d90e509aa00f00170e968f
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/9d800788f1b08800ae810202380a0822
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/X_cursor b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/X_cursor
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/X_cursor
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/X_cursor
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_down b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_down
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_down
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_up b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_up
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/base_arrow_up
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_down b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_down
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_down
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_down
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_up b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_up
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_up
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/based_arrow_up
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bd_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bd_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_left_corner b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_left_corner
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_right_corner b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_right_corner
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_side b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_side
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/bottom_side
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/c7088f0f3e6c8088236ef8e1e3e70000
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/center_ptr b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/center_ptr
index 325158011..325158011 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/center_ptr
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/center_ptr
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/circle b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/circle
index 40ce3ce06..40ce3ce06 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/circle
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/circle
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/copy b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/copy
index 8824dc5b0..8824dc5b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/copy
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/copy
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/cross b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/cross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/cross
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/cross
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/cross_reverse b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/cross_reverse
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/cross_reverse
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/cross_reverse
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/crossed_circle b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/crossed_circle
index 40893eaa0..40893eaa0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/crossed_circle
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/crossed_circle
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/crosshair b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/crosshair
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/crosshair
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/crosshair
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
index 0930af82b..0930af82b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/d9ce0ab605698f320427677b458ad60b
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/dot b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/dot
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/dot
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/dot
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/dotbox b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/dotbox
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/dotbox
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/dotbox
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draft_large b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draft_large
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draft_large
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draft_large
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draft_small b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draft_small
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draft_small
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draft_small
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draped_box b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draped_box
index 13b748e9f..13b748e9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draped_box
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/draped_box
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/e29285e634086352946a0e7090d73106
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fcf1c3c7cd4491d801f1e1c78f100000
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fd_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fd_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fleur b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fleur
index 9390d0633..9390d0633 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fleur
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/fleur
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/h_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/h_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/h_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand1 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand1
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand1
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand1
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand2 b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand2
index 01374ac9d..01374ac9d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand2
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/hand2
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr_watch b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
index d7ce4c6b0..d7ce4c6b0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_ptr_watch
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_side b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_side
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/left_side
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/link b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/link
index 93787b425..93787b425 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/link
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/link
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/ll_angle b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/ll_angle
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/ll_angle
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/ll_angle
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/lr_angle b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/lr_angle
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/lr_angle
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/lr_angle
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/move b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/move
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/move
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/move
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/pencil b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/pencil
index 9ea408ce5..9ea408ce5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/pencil
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/pencil
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/pirate b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/pirate
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/pirate
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/pirate
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/plus b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/plus
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/plus
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/plus
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/question_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/question_arrow
index 0930af82b..0930af82b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/question_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/question_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/right_ptr b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/right_ptr
index 47742d40e..47742d40e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/right_ptr
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/right_ptr
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/right_side b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/right_side
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/right_side
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/right_side
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_down_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
index a3743a37e..a3743a37e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_down_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
index 4d19b5f9f..4d19b5f9f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_h_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_left_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
index b12f2f5c0..b12f2f5c0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_left_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_right_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
index 79fda1d7b..79fda1d7b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_right_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_up_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
index 325158011..325158011 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_up_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/sb_v_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/tcross b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/tcross
index 94c7b106f..94c7b106f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/tcross
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/tcross
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_left_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_left_arrow
index 75129d83c..75129d83c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_left_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_left_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_left_corner b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_left_corner
index 7c2d94047..7c2d94047 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_left_corner
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_left_corner
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_right_corner b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_right_corner
index 9a5bd875d..9a5bd875d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_right_corner
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_right_corner
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_side b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_side
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_side
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/top_side
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/v_double_arrow b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/v_double_arrow
index 7d8d1a30b..7d8d1a30b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/v_double_arrow
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/v_double_arrow
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/watch b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/watch
index e05fc1230..e05fc1230 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/watch
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/watch
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/xterm b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/xterm
index e9e878124..e9e878124 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/xterm
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/xterm
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/xterm_extra_large b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
index 45c947824..45c947824 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/contrastlarge/cursors/xterm_extra_large
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/index.theme b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/index.theme
index b4ad00443..b4ad00443 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/cursors/index.theme
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/cursors/index.theme
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/changelog b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/changelog
index 0f9a5a20e..0f9a5a20e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/changelog
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/changelog
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/compat b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/compat
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/compat
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/control
index f52f5f20c..f52f5f20c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/control
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/copyright b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/copyright
index da861bc89..da861bc89 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/copyright
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/copyright
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/dirs b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/dirs
index a26044f48..a26044f48 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/dirs
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/dirs
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/.gitignore b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/distrospecific/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/.gitignore
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/distrospecific/.gitignore
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst
index c1f946254..c1f946254 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postrm b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
index 2cbdac854..2cbdac854 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/rules b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/rules
index b6386b0d8..b6386b0d8 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/rules
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/rules
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/source/format b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/source/format
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/source/format
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/source/include-binaries b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/source/include-binaries
index 3155a27da..3155a27da 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/source/include-binaries
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/source/include-binaries
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/source/options b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/source/options
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/source/options
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/default-icon-positions/IconPositions b/ubuntu/_base/defaultsettings/redmond-default-settings/default-icon-positions/IconPositions
index 2f8e237b1..2f8e237b1 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/default-icon-positions/IconPositions
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/default-icon-positions/IconPositions
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh b/ubuntu/_base/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
index b477f5ce2..b477f5ce2 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc b/ubuntu/_base/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc
index d8777eae9..d8777eae9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtk_qt_engine_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde4 b/ubuntu/_base/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
index e25e89fd4..e25e89fd4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/gtk-qt-engine-rc-files/gtkrc-2.0-kde4
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/_base/defaultsettings/redmond-default-settings/hal-policy-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/hal-policy-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/hal-policy-ntfs-config-write-policy.fdi
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kaffeine/fileopen.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kaffeine/fileopen.svg
index 1c35cfed6..1c35cfed6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kaffeine/fileopen.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kaffeine/fileopen.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kaffeine/fileopen128.png b/ubuntu/_base/defaultsettings/redmond-default-settings/kaffeine/fileopen128.png
index 7b3588497..7b3588497 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kaffeine/fileopen128.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kaffeine/fileopen128.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kaffeine/fileopen64.png b/ubuntu/_base/defaultsettings/redmond-default-settings/kaffeine/fileopen64.png
index 068a38680..068a38680 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kaffeine/fileopen64.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kaffeine/fileopen64.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kaffeine/wizard_stamp_v0.7.1 b/ubuntu/_base/defaultsettings/redmond-default-settings/kaffeine/wizard_stamp_v0.7.1
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kaffeine/wizard_stamp_v0.7.1
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kaffeine/wizard_stamp_v0.7.1
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-hidden/directory-home b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-hidden/directory-home
index 519a93d87..519a93d87 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-hidden/directory-home
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-hidden/directory-home
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-hidden/directory-media b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-hidden/directory-media
index 3fba6cec6..3fba6cec6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-hidden/directory-media
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-hidden/directory-media
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-hidden/hidden-media b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-hidden/hidden-media
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-hidden/hidden-media
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/adept_managerrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/adept_managerrc
index 3e7f7533d..3e7f7533d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/adept_managerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/adept_managerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/adept_notifierrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/adept_notifierrc
index 86c6056ec..86c6056ec 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/adept_notifierrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/adept_notifierrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/amarokrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/amarokrc
index b02ab8b29..b02ab8b29 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/amarokrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/amarokrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/arkrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/arkrc
index 1b3188cb8..1b3188cb8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/arkrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/arkrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
index 60167c5dd..60167c5dd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/clock_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/cryptodefaults b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/cryptodefaults
index cae93fc63..cae93fc63 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/cryptodefaults
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/d3lphinrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/d3lphinrc
index 93e4bc082..93e4bc082 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/d3lphinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/d3lphinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/gtkrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/gtkrc
index a8c3bb15b..a8c3bb15b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/gtkrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/gtkrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/gtkrc-2.0 b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/gtkrc-2.0
index ed38dfa2d..ed38dfa2d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/gtkrc-2.0
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/gtkrc-2.0
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/k3b.eventsrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/k3b.eventsrc
index 3eb68c158..3eb68c158 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/k3b.eventsrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/k3b.eventsrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/k3brc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/k3brc
index 177e2c957..177e2c957 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/k3brc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/k3brc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kaffeinerc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kaffeinerc
index 01a8e675c..01a8e675c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kaffeinerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kaffeinerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katapultrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/katapultrc
index d0a51f357..d0a51f357 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katapultrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/katapultrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/katerc
index f952dff62..f952dff62 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/katerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/katerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kbookmarkrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kbookmarkrc
index d70bd649f..d70bd649f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kbookmarkrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kbookmarkrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcminputrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kcminputrc
index e007097a0..e007097a0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kcminputrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcmlaptoprc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kcmlaptoprc
index b1c36c638..b1c36c638 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcmlaptoprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kcmlaptoprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc
index a44667033..a44667033 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcookiejarrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kdeglobals b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kdeglobals
index 820ddf718..820ddf718 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kdesktoprc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kdesktoprc
index e64b7ef97..e64b7ef97 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kdesktoprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kdesktoprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kgpgrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kgpgrc
index 9aae01a60..9aae01a60 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kgpgrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kgpgrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/khelpcenterrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/khelpcenterrc
index c4d1f4dac..c4d1f4dac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/khelpcenterrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/khelpcenterrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kickerrc
index a658c042d..a658c042d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/klipperrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/klipperrc
index 2819a62cd..2819a62cd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/klipperrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/klipperrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kmailrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kmailrc
index 07151b6a9..07151b6a9 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kmailrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kmailrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kmixrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kmixrc
index d0021119b..d0021119b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kmixrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kmixrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kmplayerrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kmplayerrc
index aac3c5721..aac3c5721 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kmplayerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kmplayerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/knemorc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/knemorc
index bce3ab226..bce3ab226 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/knemorc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/knemorc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/knotesrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/knotesrc
index befc44ca5..befc44ca5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/knotesrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/knotesrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/knotify.eventsrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/knotify.eventsrc
index 8d57ed914..8d57ed914 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/knotify.eventsrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/knotify.eventsrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/konqiconviewrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/konqiconviewrc
index 5510f2ce4..5510f2ce4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/konqiconviewrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/konqiconviewrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/konquerorrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/konquerorrc
index 25dc7ab4e..25dc7ab4e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/konquerorrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/konquerorrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/konsolerc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/konsolerc
index 9a30085cc..9a30085cc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/konsolerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/konsolerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kontactrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kontactrc
index a783507e2..a783507e2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kontactrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kontactrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/konversationrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/konversationrc
index 821eb3d25..821eb3d25 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/konversationrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/konversationrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kopeterc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kopeterc
index 6efe0ad0d..6efe0ad0d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kopeterc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kopeterc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/korgacrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/korgacrc
index f948d8c13..f948d8c13 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/korgacrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/korgacrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kscdrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kscdrc
index f552f8381..f552f8381 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kscdrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kscdrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/ksplashrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/ksplashrc
index 80b4ea864..80b4ea864 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/ksplashrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/ksplashrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/ktaskbarrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/ktaskbarrc
index 6a2734810..6a2734810 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/ktaskbarrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/ktaskbarrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/ktiprc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/ktiprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/ktiprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kuriikwsfilterrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kuriikwsfilterrc
index 5609ef964..5609ef964 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kuriikwsfilterrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kuriikwsfilterrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kuserrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kuserrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kuserrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
index 194732832..194732832 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/launcher_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/metabarrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/metabarrc
index 6ade29f07..6ade29f07 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/metabarrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/metabarrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
index 4a507a9f7..4a507a9f7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/minipager_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/profilerc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/profilerc
index 321d12cef..321d12cef 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/profilerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/profilerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/skimrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/skimrc
index 63381ac76..63381ac76 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/skimrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/skimrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/startupconfig b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/startupconfig
index abd9ea20e..abd9ea20e 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/startupconfig
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/startupconfig
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_panelapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_panelapplet_kubuntu_rc
index 8d1c8b69c..8d1c8b69c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_panelapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_panelapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
index e3689c115..e3689c115 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/taskbar_quicklaunchapplet_kubuntu_rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdehtmlrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdeio_httprc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdelaunchrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/tdelaunchrc
index 1ca985896..1ca985896 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdelaunchrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/tdelaunchrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/tdewalletrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc
index e86bdc2e0..e86bdc2e0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/twinrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/twinrc
index c8f1bcf6a..c8f1bcf6a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/twinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/twinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/uiserver b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/uiserver
index 932d73471..932d73471 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/uiserver
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/uiserver
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/yakuakerc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/yakuakerc
index 14d4a035f..14d4a035f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/yakuakerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/yakuakerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/CHANGELOG b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/CHANGELOG
index 028c9fc89..028c9fc89 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/CHANGELOG
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/CHANGELOG
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/INSTALL b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/INSTALL
index ea8a37692..ea8a37692 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/INSTALL
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/INSTALL
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/LICENSE b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/LICENSE
index d64d3ac80..d64d3ac80 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/LICENSE
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/LICENSE
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/colors b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/colors
index ac65ca342..ac65ca342 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/colors
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/colors
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
index 5d8290a23..5d8290a23 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
index c5f9a5034..c5f9a5034 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/dialogs/shutdowndialog.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
index 3eea0423a..3eea0423a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/menu/elementbgnormal.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
index 6a2fefb14..6a2fefb14 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/menu/raptorslide.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/news/down.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/news/down.svg
index 16f1f4199..16f1f4199 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/news/down.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/news/down.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/news/up.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/news/up.svg
index 7162e9353..7162e9353 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/news/up.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/news/up.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
index d68a79acd..d68a79acd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/opaque/dialogs/background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
index 412b3d684..412b3d684 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/hdd-bar.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
index 3b947f614..3b947f614 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/system-monitor/temperature-cauge.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/theme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/theme.desktop
index 334a3db9a..334a3db9a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/theme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/theme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
index a3c18d3e3..a3c18d3e3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/akonadi.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
index 8e9fa9a35..8e9fa9a35 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/analog_meter.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
index dabb94e48..dabb94e48 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
index d83b884a2..d83b884a2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_horizontal.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
index ec5abce8b..ec5abce8b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/bar_meter_vertical.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
index 967f4ed74..967f4ed74 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery-oxygen.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
index a8ab672f5..a8ab672f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/battery.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
index fc9b79f56..fc9b79f56 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/clock.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
index 92e8fee60..92e8fee60 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/connection-established.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
index ac63dd7c3..ac63dd7c3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/greenarrow.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
index c0bc6aa0c..c0bc6aa0c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/iconbutton.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
index 2afb85ea0..2afb85ea0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/kget.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
index 44b5a068d..44b5a068d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/luna.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
index 8adb0a1cf..8adb0a1cf 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/network_traffic.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
index 5279d6a4f..5279d6a4f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/notes.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
index 33c56b2bd..33c56b2bd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/panel-background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
index 201ac63e5..201ac63e5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/picture-frame-default.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
index de8d36599..de8d36599 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/plot-background.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
index 983e57026..983e57026 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/tiger.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
index c3158d60d..c3158d60d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/toolbox-button.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
index 6765b03de..6765b03de 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/artwork/desktoptheme/widgets/train-clock.svg
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-hidden/directory-home b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-hidden/directory-home
index 2e7cb00ab..2e7cb00ab 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-hidden/directory-home
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-hidden/directory-home
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-hidden/directory-media b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-hidden/directory-media
index 303a02046..303a02046 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-hidden/directory-media
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-hidden/directory-media
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-hidden/hidden-media b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-hidden/hidden-media
index 973d89575..973d89575 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-hidden/hidden-media
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-hidden/hidden-media
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
index dde841be5..dde841be5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/TODO-plasma-appletsrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/cryptodefaults b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/cryptodefaults
index 837e3aa07..837e3aa07 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/cryptodefaults
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/cryptodefaults
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/dolphinrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/dolphinrc
index 684474d37..684474d37 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/dolphinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/dolphinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/katerc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/katerc
index be120de43..be120de43 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/katerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/katerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcminputrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcminputrc
index b2fee2a64..b2fee2a64 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcminputrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcminputrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
index dcb6cd6ac..dcb6cd6ac 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcookiejarrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcookiejarrc
index ff3d27840..ff3d27840 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcookiejarrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcookiejarrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kdeglobals b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kdeglobals
index e02c15643..e02c15643 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kdeglobals
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kdeglobals
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kmixrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kmixrc
index 8c6888651..8c6888651 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kmixrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kmixrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/ktiprc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/ktiprc
index c7317505b..c7317505b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/ktiprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/ktiprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kuserrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kuserrc
index 494a5a927..494a5a927 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kuserrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kuserrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwinrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwinrc
index 8f06aef78..8f06aef78 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwinrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdehtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc
index 511161395..511161395 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdewalletrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kickerrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kickerrc
index 2bf2fd34b..2bf2fd34b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kickerrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kickerrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kompmgr-rc-files/compton-tde.conf b/ubuntu/_base/defaultsettings/redmond-default-settings/kompmgr-rc-files/compton-tde.conf
index 26c725969..26c725969 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kompmgr-rc-files/compton-tde.conf
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kompmgr-rc-files/compton-tde.conf
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kompmgr-rc-files/xcompmgrrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kompmgr-rc-files/xcompmgrrc
index 9c9b9ff17..9c9b9ff17 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kompmgr-rc-files/xcompmgrrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kompmgr-rc-files/xcompmgrrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/konqueror-profile/konq_plugins.xml b/ubuntu/_base/defaultsettings/redmond-default-settings/konqueror-profile/konq_plugins.xml
index 1df24cc92..1df24cc92 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/konqueror-profile/konq_plugins.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/konqueror-profile/konq_plugins.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-plugins/dirfilterplugin.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-plugins/dirfilterplugin.rc
index cb7bb0081..cb7bb0081 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-plugins/dirfilterplugin.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-plugins/dirfilterplugin.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc
index a45167843..a45167843 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc
index df2c4f29f..df2c4f29f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/ark_part_readonly.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/gvimagepart.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/gvimagepart.rc
index 5e0cdf11a..5e0cdf11a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/gvimagepart.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/gvimagepart.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ksvgplugin.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/ksvgplugin.rc
index abf3537d7..abf3537d7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/ksvgplugin.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/ksvgplugin.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/part.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/part.rc
index e7ecb2f3d..e7ecb2f3d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/part.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/part.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc
index 069870b55..069870b55 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/tdehtml_browser.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-7z.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-7z.desktop
index 66083b4a0..66083b4a0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-7z.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-7z.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-ace.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-ace.desktop
index 9d2484d2c..9d2484d2c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-ace.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-ace.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-arc.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-arc.desktop
index 0481ebb03..0481ebb03 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-arc.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-arc.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-archive.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-archive.desktop
index e68c7767b..e68c7767b 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-archive.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-archive.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-arj.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-arj.desktop
index b139ae430..b139ae430 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-arj.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-arj.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-bzip.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-bzip.desktop
index 3e4a5ae35..3e4a5ae35 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-bzip.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-bzip.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-bzip2.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-bzip2.desktop
index 1e374ca30..1e374ca30 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-bzip2.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-bzip2.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-compress.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-compress.desktop
index caa974dda..caa974dda 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-compress.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-compress.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-cpio.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-cpio.desktop
index 028584be7..028584be7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-cpio.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-cpio.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-gzip.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-gzip.desktop
index 1fcb83b99..1fcb83b99 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-gzip.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-gzip.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-lha.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-lha.desktop
index 6d14dc9ec..6d14dc9ec 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-lha.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-lha.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-lzop.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-lzop.desktop
index eaea7533f..eaea7533f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-lzop.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-lzop.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-pak.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-pak.desktop
index 6bb24c32d..6bb24c32d 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-pak.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-pak.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-rar.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-rar.desktop
index 6d8f0695f..6d8f0695f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-rar.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-rar.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tar.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tar.desktop
index bf9778f53..bf9778f53 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tar.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tar.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tarz.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tarz.desktop
index b1e44f1f5..b1e44f1f5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tarz.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tarz.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tbz.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tbz.desktop
index c01f6296c..c01f6296c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tbz.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tbz.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tgz.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tgz.desktop
index 9c0264556..9c0264556 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tgz.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tgz.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tzo.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tzo.desktop
index 57d65bfff..57d65bfff 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-tzo.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-tzo.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-zip.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-zip.desktop
index 8c4a6d075..8c4a6d075 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-zip.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-zip.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-zoo.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-zoo.desktop
index b1ce82a51..b1ce82a51 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/mimelnk/x-zoo.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/mimelnk/x-zoo.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/qt-rc-files/kstylerc b/ubuntu/_base/defaultsettings/redmond-default-settings/qt-rc-files/kstylerc
index 6c639810f..6c639810f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/qt-rc-files/kstylerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/qt-rc-files/kstylerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/qt-rc-files/lipstikstylerc b/ubuntu/_base/defaultsettings/redmond-default-settings/qt-rc-files/lipstikstylerc
index c1c892daa..c1c892daa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/qt-rc-files/lipstikstylerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/qt-rc-files/lipstikstylerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/qt-rc-files/polyesterstylerc b/ubuntu/_base/defaultsettings/redmond-default-settings/qt-rc-files/polyesterstylerc
index 8526d4fa6..8526d4fa6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/qt-rc-files/polyesterstylerc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/qt-rc-files/polyesterstylerc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/kde4rc b/ubuntu/_base/defaultsettings/redmond-default-settings/tde-profile/kde4rc
index 454fa83f3..454fa83f3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/kde4rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/tde-profile/kde4rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile b/ubuntu/_base/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/tderc b/ubuntu/_base/defaultsettings/redmond-default-settings/tde-profile/tderc
index 2b0f2b913..2b0f2b913 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/tderc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/tde-profile/tderc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/tdewallet-default-wallet/tdewallet.kwl b/ubuntu/_base/defaultsettings/redmond-default-settings/tdewallet-default-wallet/tdewallet.kwl
index 485b2e683..485b2e683 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/tdewallet-default-wallet/tdewallet.kwl
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/tdewallet-default-wallet/tdewallet.kwl
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/tdmdistrc b/ubuntu/_base/defaultsettings/redmond-default-settings/tdmdistrc
index f239e7c98..f239e7c98 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/tdmdistrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/tdmdistrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/ui-rc-files/gwenviewui.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/ui-rc-files/gwenviewui.rc
index 3a7b72ba4..3a7b72ba4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/ui-rc-files/gwenviewui.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/ui-rc-files/gwenviewui.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/ui-rc-files/konqueror.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/ui-rc-files/konqueror.rc
index cab74b6e5..cab74b6e5 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/ui-rc-files/konqueror.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/ui-rc-files/konqueror.rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/ui-rc-files/kopetechatwindow.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/ui-rc-files/kopetechatwindow.rc
index 56b534b10..56b534b10 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/ui-rc-files/kopetechatwindow.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/ui-rc-files/kopetechatwindow.rc
diff --git a/ubuntu/maverick/dependencies/akode/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/_base/dependencies/akode/debian/KUBUNTU-DEBIAN-CHANGES
index 481244ae4..481244ae4 100644
--- a/ubuntu/maverick/dependencies/akode/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/_base/dependencies/akode/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/ubuntu/maverick/dependencies/akode/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-qt-kde.mk
index 106cba47d..106cba47d 100644
--- a/ubuntu/maverick/dependencies/akode/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/dependencies/akode/debian/cdbs/kde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/kde.mk
index 0d878b139..0d878b139 100644
--- a/ubuntu/maverick/dependencies/akode/debian/cdbs/kde.mk
+++ b/ubuntu/_base/dependencies/akode/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/dependencies/akode/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/akode/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/ubuntu/maverick/dependencies/akode/debian/cdbs/versions.pl
+++ b/ubuntu/_base/dependencies/akode/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/dependencies/akode/debian/changelog b/ubuntu/_base/dependencies/akode/debian/changelog
index 9e455da61..9e455da61 100644
--- a/ubuntu/maverick/dependencies/akode/debian/changelog
+++ b/ubuntu/_base/dependencies/akode/debian/changelog
diff --git a/ubuntu/maverick/dependencies/akode/debian/compat b/ubuntu/_base/dependencies/akode/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/akode/debian/compat
+++ b/ubuntu/_base/dependencies/akode/debian/compat
diff --git a/ubuntu/maverick/dependencies/akode/debian/control b/ubuntu/_base/dependencies/akode/debian/control
index b411183de..b411183de 100644
--- a/ubuntu/maverick/dependencies/akode/debian/control
+++ b/ubuntu/_base/dependencies/akode/debian/control
diff --git a/ubuntu/maverick/dependencies/akode/debian/copyright b/ubuntu/_base/dependencies/akode/debian/copyright
index 34b0f44e6..34b0f44e6 100644
--- a/ubuntu/maverick/dependencies/akode/debian/copyright
+++ b/ubuntu/_base/dependencies/akode/debian/copyright
diff --git a/ubuntu/maverick/dependencies/akode/debian/libakode-dev.install b/ubuntu/_base/dependencies/akode/debian/libakode-dev.install
index 573b9c451..573b9c451 100644
--- a/ubuntu/maverick/dependencies/akode/debian/libakode-dev.install
+++ b/ubuntu/_base/dependencies/akode/debian/libakode-dev.install
diff --git a/ubuntu/maverick/dependencies/akode/debian/libakode2-mpeg.install b/ubuntu/_base/dependencies/akode/debian/libakode2-mpeg.install
index b854280ea..b854280ea 100644
--- a/ubuntu/maverick/dependencies/akode/debian/libakode2-mpeg.install
+++ b/ubuntu/_base/dependencies/akode/debian/libakode2-mpeg.install
diff --git a/ubuntu/maverick/dependencies/akode/debian/libakode2-pulse.install b/ubuntu/_base/dependencies/akode/debian/libakode2-pulse.install
index 5dc1311de..5dc1311de 100644
--- a/ubuntu/maverick/dependencies/akode/debian/libakode2-pulse.install
+++ b/ubuntu/_base/dependencies/akode/debian/libakode2-pulse.install
diff --git a/ubuntu/maverick/dependencies/akode/debian/libakode2.install b/ubuntu/_base/dependencies/akode/debian/libakode2.install
index 4e7f7ff74..4e7f7ff74 100644
--- a/ubuntu/maverick/dependencies/akode/debian/libakode2.install
+++ b/ubuntu/_base/dependencies/akode/debian/libakode2.install
diff --git a/ubuntu/maverick/dependencies/akode/debian/libakode2.lintian b/ubuntu/_base/dependencies/akode/debian/libakode2.lintian
index 6ce3df3be..6ce3df3be 100644
--- a/ubuntu/maverick/dependencies/akode/debian/libakode2.lintian
+++ b/ubuntu/_base/dependencies/akode/debian/libakode2.lintian
diff --git a/ubuntu/maverick/dependencies/akode/debian/patches/series b/ubuntu/_base/dependencies/akode/debian/patches/series
index 8b1378917..8b1378917 100644
--- a/ubuntu/maverick/dependencies/akode/debian/patches/series
+++ b/ubuntu/_base/dependencies/akode/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/akode/debian/rules b/ubuntu/_base/dependencies/akode/debian/rules
index 7d457930b..7d457930b 100755
--- a/ubuntu/maverick/dependencies/akode/debian/rules
+++ b/ubuntu/_base/dependencies/akode/debian/rules
diff --git a/ubuntu/maverick/dependencies/akode/debian/source/format b/ubuntu/_base/dependencies/akode/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/akode/debian/source/format
+++ b/ubuntu/_base/dependencies/akode/debian/source/format
diff --git a/ubuntu/maverick/dependencies/akode/debian/source/options b/ubuntu/_base/dependencies/akode/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/akode/debian/source/options
+++ b/ubuntu/_base/dependencies/akode/debian/source/options
diff --git a/ubuntu/maverick/dependencies/arts/debian/README.Debian b/ubuntu/_base/dependencies/arts/debian/README.Debian
index ca22be3b5..ca22be3b5 100644
--- a/ubuntu/maverick/dependencies/arts/debian/README.Debian
+++ b/ubuntu/_base/dependencies/arts/debian/README.Debian
diff --git a/ubuntu/maverick/dependencies/arts/debian/arts-trinity.docs b/ubuntu/_base/dependencies/arts/debian/arts-trinity.docs
index e174728f5..e174728f5 100644
--- a/ubuntu/maverick/dependencies/arts/debian/arts-trinity.docs
+++ b/ubuntu/_base/dependencies/arts/debian/arts-trinity.docs
diff --git a/ubuntu/maverick/dependencies/arts/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-qt-kde.mk
index 65f5f6f95..65f5f6f95 100644
--- a/ubuntu/maverick/dependencies/arts/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/dependencies/arts/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/arts/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/dependencies/arts/debian/cdbs/versions.pl
+++ b/ubuntu/_base/dependencies/arts/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/dependencies/arts/debian/changelog b/ubuntu/_base/dependencies/arts/debian/changelog
index 44080597a..44080597a 100644
--- a/ubuntu/maverick/dependencies/arts/debian/changelog
+++ b/ubuntu/_base/dependencies/arts/debian/changelog
diff --git a/ubuntu/maverick/dependencies/arts/debian/compat b/ubuntu/_base/dependencies/arts/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/arts/debian/compat
+++ b/ubuntu/_base/dependencies/arts/debian/compat
diff --git a/ubuntu/maverick/dependencies/arts/debian/control b/ubuntu/_base/dependencies/arts/debian/control
index 01eb5d724..01eb5d724 100644
--- a/ubuntu/maverick/dependencies/arts/debian/control
+++ b/ubuntu/_base/dependencies/arts/debian/control
diff --git a/ubuntu/maverick/dependencies/arts/debian/copyright b/ubuntu/_base/dependencies/arts/debian/copyright
index 41e40af0a..41e40af0a 100644
--- a/ubuntu/maverick/dependencies/arts/debian/copyright
+++ b/ubuntu/_base/dependencies/arts/debian/copyright
diff --git a/ubuntu/maverick/dependencies/arts/debian/libarts1-trinity-dev.docs b/ubuntu/_base/dependencies/arts/debian/libarts1-trinity-dev.docs
index e174728f5..e174728f5 100644
--- a/ubuntu/maverick/dependencies/arts/debian/libarts1-trinity-dev.docs
+++ b/ubuntu/_base/dependencies/arts/debian/libarts1-trinity-dev.docs
diff --git a/ubuntu/maverick/dependencies/arts/debian/libarts1-trinity-dev.install b/ubuntu/_base/dependencies/arts/debian/libarts1-trinity-dev.install
index 4e4e83f62..4e4e83f62 100644
--- a/ubuntu/maverick/dependencies/arts/debian/libarts1-trinity-dev.install
+++ b/ubuntu/_base/dependencies/arts/debian/libarts1-trinity-dev.install
diff --git a/ubuntu/maverick/dependencies/arts/debian/libarts1c2a-trinity.docs b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.docs
index e174728f5..e174728f5 100644
--- a/ubuntu/maverick/dependencies/arts/debian/libarts1c2a-trinity.docs
+++ b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.docs
diff --git a/ubuntu/maverick/dependencies/arts/debian/libarts1c2a-trinity.install b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install
index 856cad6c5..856cad6c5 100644
--- a/ubuntu/maverick/dependencies/arts/debian/libarts1c2a-trinity.install
+++ b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.install
diff --git a/ubuntu/maverick/dependencies/arts/debian/libarts1c2a-trinity.manpages b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
index 8d7f5c573..8d7f5c573 100644
--- a/ubuntu/maverick/dependencies/arts/debian/libarts1c2a-trinity.manpages
+++ b/ubuntu/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
diff --git a/ubuntu/maverick/dependencies/arts/debian/libartsc0-dev-trinity.manpages b/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
index cef6ee689..cef6ee689 100644
--- a/ubuntu/maverick/dependencies/arts/debian/libartsc0-dev-trinity.manpages
+++ b/ubuntu/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
diff --git a/ubuntu/maverick/dependencies/arts/debian/libartsc0-trinity-dev.install b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
index 125ebc39e..125ebc39e 100644
--- a/ubuntu/maverick/dependencies/arts/debian/libartsc0-trinity-dev.install
+++ b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
diff --git a/ubuntu/maverick/dependencies/arts/debian/libartsc0-trinity.install b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity.install
index 5295e3952..5295e3952 100644
--- a/ubuntu/maverick/dependencies/arts/debian/libartsc0-trinity.install
+++ b/ubuntu/_base/dependencies/arts/debian/libartsc0-trinity.install
diff --git a/ubuntu/maverick/dependencies/arts/debian/man/artsc-config-kde3.sgml b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml
index 8072e337d..8072e337d 100644
--- a/ubuntu/maverick/dependencies/arts/debian/man/artsc-config-kde3.sgml
+++ b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-kde3.sgml
diff --git a/ubuntu/maverick/dependencies/arts/debian/man/artsc-config-trinity.sgml b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
index 8072e337d..8072e337d 100644
--- a/ubuntu/maverick/dependencies/arts/debian/man/artsc-config-trinity.sgml
+++ b/ubuntu/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
diff --git a/ubuntu/maverick/dependencies/arts/debian/man/artscat-kde3.sgml b/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml
index 7dff34d95..7dff34d95 100644
--- a/ubuntu/maverick/dependencies/arts/debian/man/artscat-kde3.sgml
+++ b/ubuntu/_base/dependencies/arts/debian/man/artscat-kde3.sgml
diff --git a/ubuntu/maverick/dependencies/arts/debian/man/artscat-trinity.sgml b/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml
index 7dff34d95..7dff34d95 100644
--- a/ubuntu/maverick/dependencies/arts/debian/man/artscat-trinity.sgml
+++ b/ubuntu/_base/dependencies/arts/debian/man/artscat-trinity.sgml
diff --git a/ubuntu/maverick/dependencies/arts/debian/man/artsdsp-kde3.1 b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1
index 2615f47c2..2615f47c2 100644
--- a/ubuntu/maverick/dependencies/arts/debian/man/artsdsp-kde3.1
+++ b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-kde3.1
diff --git a/ubuntu/maverick/dependencies/arts/debian/man/artsdsp-trinity.1 b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1
index 2615f47c2..2615f47c2 100644
--- a/ubuntu/maverick/dependencies/arts/debian/man/artsdsp-trinity.1
+++ b/ubuntu/_base/dependencies/arts/debian/man/artsdsp-trinity.1
diff --git a/ubuntu/maverick/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff b/ubuntu/_base/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
index cae8f366d..cae8f366d 100644
--- a/ubuntu/maverick/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
+++ b/ubuntu/_base/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
diff --git a/ubuntu/maverick/dependencies/arts/debian/patches/series b/ubuntu/_base/dependencies/arts/debian/patches/series
index 59e055db8..59e055db8 100644
--- a/ubuntu/maverick/dependencies/arts/debian/patches/series
+++ b/ubuntu/_base/dependencies/arts/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules
index 331393698..331393698 100755
--- a/ubuntu/maverick/dependencies/arts/debian/rules
+++ b/ubuntu/_base/dependencies/arts/debian/rules
diff --git a/ubuntu/maverick/dependencies/arts/debian/source/format b/ubuntu/_base/dependencies/arts/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/arts/debian/source/format
+++ b/ubuntu/_base/dependencies/arts/debian/source/format
diff --git a/ubuntu/maverick/dependencies/arts/debian/source/options b/ubuntu/_base/dependencies/arts/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/arts/debian/source/options
+++ b/ubuntu/_base/dependencies/arts/debian/source/options
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/changelog b/ubuntu/_base/dependencies/avahi-tqt/debian/changelog
index b5568caee..b5568caee 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/changelog
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/changelog
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/compat b/ubuntu/_base/dependencies/avahi-tqt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/compat
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/control b/ubuntu/_base/dependencies/avahi-tqt/debian/control
index 2ab2e4a7f..2ab2e4a7f 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/control
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/control
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/copyright b/ubuntu/_base/dependencies/avahi-tqt/debian/copyright
index 6771a11ab..6771a11ab 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/copyright
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/copyright
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.install b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
index 50e360b80..50e360b80 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
index 967448229..967448229 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
index e530241ba..e530241ba 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
index 7f65054bd..7f65054bd 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/patches/.gitignore b/ubuntu/_base/dependencies/avahi-tqt/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/patches/.gitignore
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/patches/.gitignore
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules b/ubuntu/_base/dependencies/avahi-tqt/debian/rules
index 32d30901d..32d30901d 100755
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/rules
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/.gitignore b/ubuntu/_base/dependencies/avahi-tqt/debian/source/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/.gitignore
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/source/.gitignore
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/format b/ubuntu/_base/dependencies/avahi-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/format
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/source/format
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/options b/ubuntu/_base/dependencies/avahi-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/options
+++ b/ubuntu/_base/dependencies/avahi-tqt/debian/source/options
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/changelog b/ubuntu/_base/dependencies/dbus-1-tqt/debian/changelog
index 6ade667cf..6ade667cf 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/changelog
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/changelog
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/compat b/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/compat
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
index cdfde443c..cdfde443c 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/control
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/control
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/copyright b/ubuntu/_base/dependencies/dbus-1-tqt/debian/copyright
index 7a556c0d1..7a556c0d1 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/copyright
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/copyright
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install b/ubuntu/_base/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install
index 5464fd411..5464fd411 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install b/ubuntu/_base/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install
index 383103395..383103395 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series b/ubuntu/_base/dependencies/dbus-1-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules
index eedd1bf26..eedd1bf26 100755
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/rules
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/format b/ubuntu/_base/dependencies/dbus-1-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/format
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/source/format
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/options b/ubuntu/_base/dependencies/dbus-1-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/options
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/source/options
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/changelog b/ubuntu/_base/dependencies/dbus-tqt/debian/changelog
index 91871211a..91871211a 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/changelog
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/changelog
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/compat b/ubuntu/_base/dependencies/dbus-tqt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/compat
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/control b/ubuntu/_base/dependencies/dbus-tqt/debian/control
index 4b1fb2b5c..4b1fb2b5c 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/control
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/control
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/copyright b/ubuntu/_base/dependencies/dbus-tqt/debian/copyright
index 9541c0a8f..9541c0a8f 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/copyright
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/copyright
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install
index bf44f3563..bf44f3563 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install
index 6ee3e25c3..6ee3e25c3 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series b/ubuntu/_base/dependencies/dbus-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules b/ubuntu/_base/dependencies/dbus-tqt/debian/rules
index 71f625c30..71f625c30 100755
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/rules
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/source/format b/ubuntu/_base/dependencies/dbus-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/source/format
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/source/format
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/source/options b/ubuntu/_base/dependencies/dbus-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/source/options
+++ b/ubuntu/_base/dependencies/dbus-tqt/debian/source/options
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/changelog b/ubuntu/_base/dependencies/libart-lgpl/debian/changelog
index d9238f241..d9238f241 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/changelog
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/changelog
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/compat b/ubuntu/_base/dependencies/libart-lgpl/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/compat
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/compat
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/control b/ubuntu/_base/dependencies/libart-lgpl/debian/control
index 686fb2b57..686fb2b57 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/control
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/control
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/copyright b/ubuntu/_base/dependencies/libart-lgpl/debian/copyright
index 6c6d40347..6c6d40347 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/copyright
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/copyright
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-2.install b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install
index be04efa71..be04efa71 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-2.install
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-2.install
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.install b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install
index 154d573e6..154d573e6 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.install
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.install
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages
index d9f908cc0..d9f908cc0 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/libart-2.0-dev.manpages
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart2-config.1 b/ubuntu/_base/dependencies/libart-lgpl/debian/libart2-config.1
index 7439b2923..7439b2923 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/libart2-config.1
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/libart2-config.1
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/patches/series b/ubuntu/_base/dependencies/libart-lgpl/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/patches/series
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules b/ubuntu/_base/dependencies/libart-lgpl/debian/rules
index 8ead6b1fc..8ead6b1fc 100755
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/rules
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/source/format b/ubuntu/_base/dependencies/libart-lgpl/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/source/format
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/source/format
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/source/options b/ubuntu/_base/dependencies/libart-lgpl/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/source/options
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/source/options
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/watch b/ubuntu/_base/dependencies/libart-lgpl/debian/watch
index 8acf72053..8acf72053 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/watch
+++ b/ubuntu/_base/dependencies/libart-lgpl/debian/watch
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/README.Debian b/ubuntu/_base/dependencies/libcaldav/debian/README.Debian
index 9adebeacc..9adebeacc 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/README.Debian
+++ b/ubuntu/_base/dependencies/libcaldav/debian/README.Debian
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/README.fallback b/ubuntu/_base/dependencies/libcaldav/debian/README.fallback
index 1b41c225f..1b41c225f 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/README.fallback
+++ b/ubuntu/_base/dependencies/libcaldav/debian/README.fallback
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/changelog b/ubuntu/_base/dependencies/libcaldav/debian/changelog
index 13d81ef1d..13d81ef1d 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/changelog
+++ b/ubuntu/_base/dependencies/libcaldav/debian/changelog
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/compat b/ubuntu/_base/dependencies/libcaldav/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/compat
+++ b/ubuntu/_base/dependencies/libcaldav/debian/compat
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/control b/ubuntu/_base/dependencies/libcaldav/debian/control
index 5aee0c950..5aee0c950 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/control
+++ b/ubuntu/_base/dependencies/libcaldav/debian/control
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/copyright b/ubuntu/_base/dependencies/libcaldav/debian/copyright
index a0ce37b8b..a0ce37b8b 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/copyright
+++ b/ubuntu/_base/dependencies/libcaldav/debian/copyright
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/patches/series b/ubuntu/_base/dependencies/libcaldav/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/patches/series
+++ b/ubuntu/_base/dependencies/libcaldav/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/rules b/ubuntu/_base/dependencies/libcaldav/debian/rules
index a6922482f..a6922482f 100755
--- a/ubuntu/maverick/dependencies/libcaldav/debian/rules
+++ b/ubuntu/_base/dependencies/libcaldav/debian/rules
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/source/format b/ubuntu/_base/dependencies/libcaldav/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/source/format
+++ b/ubuntu/_base/dependencies/libcaldav/debian/source/format
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/source/options b/ubuntu/_base/dependencies/libcaldav/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/source/options
+++ b/ubuntu/_base/dependencies/libcaldav/debian/source/options
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/watch b/ubuntu/_base/dependencies/libcaldav/debian/watch
index 8cea7d35f..8cea7d35f 100644
--- a/ubuntu/maverick/dependencies/libcaldav/debian/watch
+++ b/ubuntu/_base/dependencies/libcaldav/debian/watch
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/README.Debian b/ubuntu/_base/dependencies/libcarddav/debian/README.Debian
index 9adebeacc..9adebeacc 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/README.Debian
+++ b/ubuntu/_base/dependencies/libcarddav/debian/README.Debian
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/README.fallback b/ubuntu/_base/dependencies/libcarddav/debian/README.fallback
index 1b41c225f..1b41c225f 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/README.fallback
+++ b/ubuntu/_base/dependencies/libcarddav/debian/README.fallback
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/changelog b/ubuntu/_base/dependencies/libcarddav/debian/changelog
index 4dfba942d..4dfba942d 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/changelog
+++ b/ubuntu/_base/dependencies/libcarddav/debian/changelog
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/compat b/ubuntu/_base/dependencies/libcarddav/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/compat
+++ b/ubuntu/_base/dependencies/libcarddav/debian/compat
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/control b/ubuntu/_base/dependencies/libcarddav/debian/control
index c2409ffd1..c2409ffd1 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/control
+++ b/ubuntu/_base/dependencies/libcarddav/debian/control
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/copyright b/ubuntu/_base/dependencies/libcarddav/debian/copyright
index 916e3fd34..916e3fd34 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/copyright
+++ b/ubuntu/_base/dependencies/libcarddav/debian/copyright
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/patches/series b/ubuntu/_base/dependencies/libcarddav/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/patches/series
+++ b/ubuntu/_base/dependencies/libcarddav/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/rules b/ubuntu/_base/dependencies/libcarddav/debian/rules
index 38c17ea44..38c17ea44 100755
--- a/ubuntu/maverick/dependencies/libcarddav/debian/rules
+++ b/ubuntu/_base/dependencies/libcarddav/debian/rules
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/source/format b/ubuntu/_base/dependencies/libcarddav/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/source/format
+++ b/ubuntu/_base/dependencies/libcarddav/debian/source/format
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/source/options b/ubuntu/_base/dependencies/libcarddav/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/source/options
+++ b/ubuntu/_base/dependencies/libcarddav/debian/source/options
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/watch b/ubuntu/_base/dependencies/libcarddav/debian/watch
index 8cea7d35f..8cea7d35f 100644
--- a/ubuntu/maverick/dependencies/libcarddav/debian/watch
+++ b/ubuntu/_base/dependencies/libcarddav/debian/watch
diff --git a/ubuntu/maverick/dependencies/libr/debian/README.Debian b/ubuntu/_base/dependencies/libr/debian/README.Debian
index 120ea0ed1..120ea0ed1 100644
--- a/ubuntu/maverick/dependencies/libr/debian/README.Debian
+++ b/ubuntu/_base/dependencies/libr/debian/README.Debian
diff --git a/ubuntu/maverick/dependencies/libr/debian/changelog b/ubuntu/_base/dependencies/libr/debian/changelog
index e10d865e5..e10d865e5 100644
--- a/ubuntu/maverick/dependencies/libr/debian/changelog
+++ b/ubuntu/_base/dependencies/libr/debian/changelog
diff --git a/ubuntu/maverick/dependencies/libr/debian/compat b/ubuntu/_base/dependencies/libr/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/libr/debian/compat
+++ b/ubuntu/_base/dependencies/libr/debian/compat
diff --git a/ubuntu/maverick/dependencies/libr/debian/control b/ubuntu/_base/dependencies/libr/debian/control
index 471fc6475..471fc6475 100644
--- a/ubuntu/maverick/dependencies/libr/debian/control
+++ b/ubuntu/_base/dependencies/libr/debian/control
diff --git a/ubuntu/maverick/dependencies/libr/debian/copyright b/ubuntu/_base/dependencies/libr/debian/copyright
index 3a93ee59b..3a93ee59b 100644
--- a/ubuntu/maverick/dependencies/libr/debian/copyright
+++ b/ubuntu/_base/dependencies/libr/debian/copyright
diff --git a/ubuntu/maverick/dependencies/libr/debian/dirs b/ubuntu/_base/dependencies/libr/debian/dirs
index ca882bbb7..ca882bbb7 100644
--- a/ubuntu/maverick/dependencies/libr/debian/dirs
+++ b/ubuntu/_base/dependencies/libr/debian/dirs
diff --git a/ubuntu/maverick/dependencies/libr/debian/docs b/ubuntu/_base/dependencies/libr/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/ubuntu/maverick/dependencies/libr/debian/docs
+++ b/ubuntu/_base/dependencies/libr/debian/docs
diff --git a/ubuntu/maverick/dependencies/libr/debian/libr-dev.dirs b/ubuntu/_base/dependencies/libr/debian/libr-dev.dirs
index 441fd8fc6..441fd8fc6 100644
--- a/ubuntu/maverick/dependencies/libr/debian/libr-dev.dirs
+++ b/ubuntu/_base/dependencies/libr/debian/libr-dev.dirs
diff --git a/ubuntu/maverick/dependencies/libr/debian/libr-dev.install b/ubuntu/_base/dependencies/libr/debian/libr-dev.install
index 6fad4769a..6fad4769a 100644
--- a/ubuntu/maverick/dependencies/libr/debian/libr-dev.install
+++ b/ubuntu/_base/dependencies/libr/debian/libr-dev.install
diff --git a/ubuntu/maverick/dependencies/libr/debian/libr0.dirs b/ubuntu/_base/dependencies/libr/debian/libr0.dirs
index 68457717b..68457717b 100644
--- a/ubuntu/maverick/dependencies/libr/debian/libr0.dirs
+++ b/ubuntu/_base/dependencies/libr/debian/libr0.dirs
diff --git a/ubuntu/maverick/dependencies/libr/debian/libr0.install b/ubuntu/_base/dependencies/libr/debian/libr0.install
index d0dbfd18a..d0dbfd18a 100644
--- a/ubuntu/maverick/dependencies/libr/debian/libr0.install
+++ b/ubuntu/_base/dependencies/libr/debian/libr0.install
diff --git a/ubuntu/maverick/dependencies/libr/debian/patches/series b/ubuntu/_base/dependencies/libr/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/libr/debian/patches/series
+++ b/ubuntu/_base/dependencies/libr/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules
index 1b6b94b3e..1b6b94b3e 100755
--- a/ubuntu/maverick/dependencies/libr/debian/rules
+++ b/ubuntu/_base/dependencies/libr/debian/rules
diff --git a/ubuntu/maverick/dependencies/libr/debian/source/format b/ubuntu/_base/dependencies/libr/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/libr/debian/source/format
+++ b/ubuntu/_base/dependencies/libr/debian/source/format
diff --git a/ubuntu/maverick/dependencies/libr/debian/source/options b/ubuntu/_base/dependencies/libr/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/libr/debian/source/options
+++ b/ubuntu/_base/dependencies/libr/debian/source/options
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/README.Debian b/ubuntu/_base/dependencies/python-tqt/debian/README.Debian
index 33603ec40..33603ec40 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/README.Debian
+++ b/ubuntu/_base/dependencies/python-tqt/debian/README.Debian
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/changelog b/ubuntu/_base/dependencies/python-tqt/debian/changelog
index 95e2f0cce..95e2f0cce 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/changelog
+++ b/ubuntu/_base/dependencies/python-tqt/debian/changelog
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/compat b/ubuntu/_base/dependencies/python-tqt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/python-tqt/debian/compat
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/control b/ubuntu/_base/dependencies/python-tqt/debian/control
index 5e6a36407..5e6a36407 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/control
+++ b/ubuntu/_base/dependencies/python-tqt/debian/control
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/copyright b/ubuntu/_base/dependencies/python-tqt/debian/copyright
index 715a83f24..715a83f24 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/copyright
+++ b/ubuntu/_base/dependencies/python-tqt/debian/copyright
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/docs b/ubuntu/_base/dependencies/python-tqt/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/docs
+++ b/ubuntu/_base/dependencies/python-tqt/debian/docs
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pylupdate.1 b/ubuntu/_base/dependencies/python-tqt/debian/manpages/pylupdate.1
index 4d2c8919a..4d2c8919a 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pylupdate.1
+++ b/ubuntu/_base/dependencies/python-tqt/debian/manpages/pylupdate.1
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pyuic.1 b/ubuntu/_base/dependencies/python-tqt/debian/manpages/pyuic.1
index f1ffa41ff..f1ffa41ff 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/manpages/pyuic.1
+++ b/ubuntu/_base/dependencies/python-tqt/debian/manpages/pyuic.1
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/ubuntu/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff
index 131e9dbdc..131e9dbdc 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/patches/debian_configure_changes.diff
+++ b/ubuntu/_base/dependencies/python-tqt/debian/patches/debian_configure_changes.diff
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/patches/series b/ubuntu/_base/dependencies/python-tqt/debian/patches/series
index 573069d8d..573069d8d 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/patches/series
+++ b/ubuntu/_base/dependencies/python-tqt/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.dirs b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
index ae635cbcd..ae635cbcd 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.dirs
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
index 7b6aca191..7b6aca191 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
index 36e6c1349..36e6c1349 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs
index 43a4fa9fa..43a4fa9fa 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.examples b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples
index 3162f69a8..3162f69a8 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.examples
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install
index 65f82036b..65f82036b 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-doc.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-gl.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install
index 288f3cb88..288f3cb88 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt-gl.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install
index 61a9363d0..61a9363d0 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqt.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqtext.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install
index 582be1bb1..582be1bb1 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/python-tqtext.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.install b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.install
index 1df36c612..1df36c612 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.install
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.manpages b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages
index 7d27d0034..7d27d0034 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/pytqt-tools.manpages
+++ b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-tools.manpages
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/_base/dependencies/python-tqt/debian/rules
index fa7a8bfcb..fa7a8bfcb 100755
--- a/ubuntu/maverick/dependencies/python-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/python-tqt/debian/rules
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/source/format b/ubuntu/_base/dependencies/python-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/source/format
+++ b/ubuntu/_base/dependencies/python-tqt/debian/source/format
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/source/options b/ubuntu/_base/dependencies/python-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/source/options
+++ b/ubuntu/_base/dependencies/python-tqt/debian/source/options
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/watch b/ubuntu/_base/dependencies/python-tqt/debian/watch
index 506321d38..506321d38 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/watch
+++ b/ubuntu/_base/dependencies/python-tqt/debian/watch
diff --git a/ubuntu/maverick/dependencies/qt3/debian/README.Debian b/ubuntu/_base/dependencies/qt3/debian/README.Debian
index 7cc02d1ec..7cc02d1ec 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/README.Debian
+++ b/ubuntu/_base/dependencies/qt3/debian/README.Debian
diff --git a/ubuntu/maverick/dependencies/qt3/debian/changelog b/ubuntu/_base/dependencies/qt3/debian/changelog
index f7da260d9..f7da260d9 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/changelog
+++ b/ubuntu/_base/dependencies/qt3/debian/changelog
diff --git a/ubuntu/maverick/dependencies/qt3/debian/compat b/ubuntu/_base/dependencies/qt3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/compat
+++ b/ubuntu/_base/dependencies/qt3/debian/compat
diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/_base/dependencies/qt3/debian/control
index 7b8f1477a..7b8f1477a 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/control
+++ b/ubuntu/_base/dependencies/qt3/debian/control
diff --git a/ubuntu/maverick/dependencies/qt3/debian/copyright b/ubuntu/_base/dependencies/qt3/debian/copyright
index 78872c85b..78872c85b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/copyright
+++ b/ubuntu/_base/dependencies/qt3/debian/copyright
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-compat-headers.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-compat-headers.install
index d760342dd..d760342dd 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-compat-headers.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-compat-headers.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-headers.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install
index 2c789fcee..2c789fcee 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-headers.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-i18n.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-i18n.install
index ac62f216d..ac62f216d 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-i18n.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-i18n.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.docs b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.docs
index dbd9a5d19..dbd9a5d19 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.docs
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.docs
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install
index 09432e016..09432e016 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.links b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.links
index 506e3e49b..506e3e49b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.links
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-ibase.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-ibase.install
index e7d5a549a..e7d5a549a 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-ibase.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-ibase.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-mysql.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-mysql.install
index 8fba7992f..8fba7992f 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-mysql.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-mysql.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-odbc.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-odbc.install
index f06ddf32c..f06ddf32c 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-odbc.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-odbc.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-psql.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-psql.install
index f9914863f..f9914863f 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-psql.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-psql.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install
index 1bdd0e354..1bdd0e354 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite3.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite3.install
index 27f831bad..27f831bad 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite3.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite3.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.docs b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.docs
index dbd9a5d19..dbd9a5d19 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.docs
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.docs
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.install
index 325e87900..325e87900 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.links b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.links
index d8375caef..d8375caef 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.links
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.postrm b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.postrm
index 5f09e318d..5f09e318d 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.postrm
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.postrm
diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/assistant-qt3.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop
index 42a16e80e..42a16e80e 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/maintain/assistant-qt3.desktop
+++ b/ubuntu/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop
diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/build-examples.sh b/ubuntu/_base/dependencies/qt3/debian/maintain/build-examples.sh
index b56d51e42..b56d51e42 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/maintain/build-examples.sh
+++ b/ubuntu/_base/dependencies/qt3/debian/maintain/build-examples.sh
diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/designer-qt3.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop
index fc9f4394c..fc9f4394c 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/maintain/designer-qt3.desktop
+++ b/ubuntu/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop
diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/linguist-qt3.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop
index e0094dbd4..e0094dbd4 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/maintain/linguist-qt3.desktop
+++ b/ubuntu/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop
diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/mkpatch.sh b/ubuntu/_base/dependencies/qt3/debian/maintain/mkpatch.sh
index 609a44bc1..609a44bc1 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/maintain/mkpatch.sh
+++ b/ubuntu/_base/dependencies/qt3/debian/maintain/mkpatch.sh
diff --git a/ubuntu/maverick/dependencies/qt3/debian/maintain/qt3config.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/qt3config.desktop
index 22d0ca6a5..22d0ca6a5 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/maintain/qt3config.desktop
+++ b/ubuntu/_base/dependencies/qt3/debian/maintain/qt3config.desktop
diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/06_disable_rpath.diff b/ubuntu/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff
index a3d74ffce..a3d74ffce 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/patches/06_disable_rpath.diff
+++ b/ubuntu/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff
diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/09_amd64_lib64.diff b/ubuntu/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff
index 538e93044..538e93044 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/patches/09_amd64_lib64.diff
+++ b/ubuntu/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff
diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/ubuntu/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
index b4e71d35b..b4e71d35b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+++ b/ubuntu/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/series b/ubuntu/_base/dependencies/qt3/debian/patches/series
index e6bdb92af..e6bdb92af 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/patches/series
+++ b/ubuntu/_base/dependencies/qt3/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install b/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.install
index ad98c3165..ad98c3165 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.links b/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.links
index 6c031422f..6c031422f 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.links
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.install b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.install
index 4ca90e4b7..4ca90e4b7 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.install
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.links b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.links
index 6d9889d21..6d9889d21 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.links
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.menu
index 1b4c81243..1b4c81243 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.menu
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.menu
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.postinst
index 137ecd777..137ecd777 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.postinst
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.postinst
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.prerm
index 9bcf8c713..9bcf8c713 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-assistant.prerm
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.prerm
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.install b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.install
index ac0c0902b..ac0c0902b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.install
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.links b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.links
index d25356b76..d25356b76 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.links
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.menu
index 9b15d7bb5..9b15d7bb5 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.menu
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.menu
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.postinst
index 147bf1bf8..147bf1bf8 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.postinst
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.postinst
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.prerm
index c66496fd1..c66496fd1 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.prerm
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.prerm
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools-compat.install b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install
index 838f6b827..838f6b827 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools-compat.install
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools-embedded.install b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install
index 2954f7a4c..2954f7a4c 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools-embedded.install
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools-embedded.links b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links
index feacdd2c4..feacdd2c4 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools-embedded.links
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools.install b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.install
index 57f9636e5..57f9636e5 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools.install
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools.links b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.links
index 3a9ee784c..3a9ee784c 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools.links
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.postinst
index 70ca043fe..70ca043fe 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools.postinst
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.postinst
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.prerm
index 3db3df44b..3db3df44b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-dev-tools.prerm
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.prerm
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-doc.doc-base b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.doc-base
index 7a11cb2dc..7a11cb2dc 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-doc.doc-base
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.doc-base
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-doc.docs b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.docs
index f08fd0f02..f08fd0f02 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-doc.docs
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.docs
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-doc.links b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.links
index e8b1a344c..e8b1a344c 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-doc.links
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.install b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.install
index ff9ac89a1..ff9ac89a1 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.install
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.links b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.links
index be3092258..be3092258 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.links
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.menu
index ebd7e43b7..ebd7e43b7 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.menu
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.menu
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.postinst
index ed27c328b..ed27c328b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.postinst
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.postinst
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.prerm
index 74b010627..74b010627 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-linguist.prerm
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.prerm
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.install b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.install
index 8fcee756b..8fcee756b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.install
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.install
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.links b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.links
index 9a168aec4..9a168aec4 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.links
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.links
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.menu
index c8b243496..c8b243496 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.menu
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.menu
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.postinst
index be89a0151..be89a0151 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.postinst
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.postinst
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.prerm
index 3985383b4..3985383b4 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-qtconfig.prerm
+++ b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.prerm
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt_plugins_3.3rc b/ubuntu/_base/dependencies/qt3/debian/qt_plugins_3.3rc
index 9fb7f9711..9fb7f9711 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt_plugins_3.3rc
+++ b/ubuntu/_base/dependencies/qt3/debian/qt_plugins_3.3rc
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qtrc b/ubuntu/_base/dependencies/qt3/debian/qtrc
index 3c977f4d1..3c977f4d1 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qtrc
+++ b/ubuntu/_base/dependencies/qt3/debian/qtrc
diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/_base/dependencies/qt3/debian/rules
index 308ea664e..308ea664e 100755
--- a/ubuntu/maverick/dependencies/qt3/debian/rules
+++ b/ubuntu/_base/dependencies/qt3/debian/rules
diff --git a/ubuntu/maverick/dependencies/qt3/debian/source/format b/ubuntu/_base/dependencies/qt3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/source/format
+++ b/ubuntu/_base/dependencies/qt3/debian/source/format
diff --git a/ubuntu/maverick/dependencies/qt3/debian/source/options b/ubuntu/_base/dependencies/qt3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/source/options
+++ b/ubuntu/_base/dependencies/qt3/debian/source/options
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/changelog b/ubuntu/_base/dependencies/sip4-tqt/debian/changelog
index 6634575fe..6634575fe 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/changelog
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/changelog
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/compat b/ubuntu/_base/dependencies/sip4-tqt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/compat
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/compat
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/control b/ubuntu/_base/dependencies/sip4-tqt/debian/control
index d7187b9e0..d7187b9e0 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/control
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/copyright b/ubuntu/_base/dependencies/sip4-tqt/debian/copyright
index b1fc4bd72..b1fc4bd72 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/copyright
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/copyright
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/dh_sip_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
index b1a8c19e3..b1a8c19e3 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/dh_sip_tqt
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/docs b/ubuntu/_base/dependencies/sip4-tqt/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/docs
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/docs
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
index ea429fe9a..ea429fe9a 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/sip.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1
index ce178cc7e..ce178cc7e 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/manpages/sip.1
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/sip.1
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series
index 0b31a69ff..0b31a69ff 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff
index 2640f57c2..2640f57c2 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
index 3c4570b21..3c4570b21 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs
index 416a453aa..416a453aa 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
index 1df36c612..1df36c612 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
index fdd5af4cc..fdd5af4cc 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
index ba33bb512..ba33bb512 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
index 9639c2814..9639c2814 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/pyversions b/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions
index 57a7586e4..57a7586e4 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/pyversions
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
index 86a541601..86a541601 100755
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/sipconfig.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
index a9e761f08..a9e761f08 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/sipconfig.py
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sipconfig.py
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/format b/ubuntu/_base/dependencies/sip4-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/format
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/source/format
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/options b/ubuntu/_base/dependencies/sip4-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/options
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/source/options
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/watch b/ubuntu/_base/dependencies/sip4-tqt/debian/watch
index 1ff1f0839..1ff1f0839 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/watch
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/watch
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/changelog b/ubuntu/_base/dependencies/tqca-tls/debian/changelog
index 7f1c440b0..7f1c440b0 100644
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/changelog
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/changelog
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/compat b/ubuntu/_base/dependencies/tqca-tls/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/compat
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/compat
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/control b/ubuntu/_base/dependencies/tqca-tls/debian/control
index d84c1992b..d84c1992b 100644
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/control
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/control
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/copyright b/ubuntu/_base/dependencies/tqca-tls/debian/copyright
index e64397c08..e64397c08 100644
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/copyright
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/copyright
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/docs b/ubuntu/_base/dependencies/tqca-tls/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/docs
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/docs
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/rules b/ubuntu/_base/dependencies/tqca-tls/debian/rules
index 2ea43315e..2ea43315e 100755
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/rules
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/rules
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/source/format b/ubuntu/_base/dependencies/tqca-tls/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/source/format
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/source/format
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/source/options b/ubuntu/_base/dependencies/tqca-tls/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/source/options
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/source/options
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/tqca-tls.install b/ubuntu/_base/dependencies/tqca-tls/debian/tqca-tls.install
index d165ec389..d165ec389 100644
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/tqca-tls.install
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/tqca-tls.install
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/changelog b/ubuntu/_base/dependencies/tqscintilla/debian/changelog
index bf84dfd0f..bf84dfd0f 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/changelog
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/changelog
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/compat b/ubuntu/_base/dependencies/tqscintilla/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/compat
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/compat
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/control b/ubuntu/_base/dependencies/tqscintilla/debian/control
index c92ea8db1..c92ea8db1 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/control
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/control
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/copyright b/ubuntu/_base/dependencies/tqscintilla/debian/copyright
index 445a8ff70..445a8ff70 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/copyright
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/copyright
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/dirs b/ubuntu/_base/dependencies/tqscintilla/debian/dirs
index ca882bbb7..ca882bbb7 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/dirs
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/dirs
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/docs b/ubuntu/_base/dependencies/tqscintilla/debian/docs
index edc007104..edc007104 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/docs
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/docs
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-dev.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
index e183cf963..e183cf963 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-dev.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-dev.install
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-doc.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
index 005276324..005276324 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla-doc.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla-doc.install
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla7.install b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
index 2cfef7f8a..2cfef7f8a 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/libtqscintilla7.install
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/libtqscintilla7.install
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/rules b/ubuntu/_base/dependencies/tqscintilla/debian/rules
index e9b6272ac..e9b6272ac 100755
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/rules
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/rules
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/source/format b/ubuntu/_base/dependencies/tqscintilla/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/source/format
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/source/format
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/source/options b/ubuntu/_base/dependencies/tqscintilla/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/source/options
+++ b/ubuntu/_base/dependencies/tqscintilla/debian/source/options
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/README.Debian b/ubuntu/_base/dependencies/tqt3/debian/README.Debian
index 63996972e..63996972e 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/README.Debian
+++ b/ubuntu/_base/dependencies/tqt3/debian/README.Debian
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/changelog b/ubuntu/_base/dependencies/tqt3/debian/changelog
index 3e813531e..3e813531e 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/changelog
+++ b/ubuntu/_base/dependencies/tqt3/debian/changelog
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/compat b/ubuntu/_base/dependencies/tqt3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/compat
+++ b/ubuntu/_base/dependencies/tqt3/debian/compat
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/control b/ubuntu/_base/dependencies/tqt3/debian/control
index ccffa21bf..ccffa21bf 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/control
+++ b/ubuntu/_base/dependencies/tqt3/debian/control
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/copyright b/ubuntu/_base/dependencies/tqt3/debian/copyright
index 3482b8b3a..3482b8b3a 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/copyright
+++ b/ubuntu/_base/dependencies/tqt3/debian/copyright
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install
index bdab50e98..bdab50e98 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-compat-headers.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-compat-headers.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
index 32d3bb87d..32d3bb87d 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-headers.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-i18n.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-i18n.install
index cd272202b..cd272202b 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-i18n.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-i18n.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs
index dbd9a5d19..dbd9a5d19 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.docs
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.docs
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
index e846fb59e..e846fb59e 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.links b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links
index e382bae07..e382bae07 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install
index 37bbf0bb1..37bbf0bb1 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-ibase.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-ibase.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install
index efdb699be..efdb699be 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-mysql.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-mysql.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install
index 3b949c134..3b949c134 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-odbc.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-odbc.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-psql.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install
index b93ebe333..b93ebe333 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-psql.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-psql.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
index 928632aa1..928632aa1 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
index fccd1c31b..fccd1c31b 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.docs b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs
index dbd9a5d19..dbd9a5d19 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.docs
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.docs
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install
index 519221dff..519221dff 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.links b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.links
index fee2958d8..fee2958d8 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.postrm b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.postrm
index bb679158a..bb679158a 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.postrm
+++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.postrm
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
index 3072b99aa..3072b99aa 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
+++ b/ubuntu/_base/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh b/ubuntu/_base/dependencies/tqt3/debian/maintain/build-examples.sh
index ad98ad5be..ad98ad5be 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/build-examples.sh
+++ b/ubuntu/_base/dependencies/tqt3/debian/maintain/build-examples.sh
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/designer-tqt3.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
index cc95cead5..cc95cead5 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
+++ b/ubuntu/_base/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
index d879d32db..d879d32db 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
+++ b/ubuntu/_base/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/mkpatch.sh b/ubuntu/_base/dependencies/tqt3/debian/maintain/mkpatch.sh
index 609a44bc1..609a44bc1 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/mkpatch.sh
+++ b/ubuntu/_base/dependencies/tqt3/debian/maintain/mkpatch.sh
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/tqt3config.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/tqt3config.desktop
index b3535c06f..b3535c06f 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/tqt3config.desktop
+++ b/ubuntu/_base/dependencies/tqt3/debian/maintain/tqt3config.desktop
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/ubuntu/_base/dependencies/tqt3/debian/patches/06_disable_rpath.diff
index a3d74ffce..a3d74ffce 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff
+++ b/ubuntu/_base/dependencies/tqt3/debian/patches/06_disable_rpath.diff
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/09_amd64_lib64.diff b/ubuntu/_base/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
index 538e93044..538e93044 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
+++ b/ubuntu/_base/dependencies/tqt3/debian/patches/09_amd64_lib64.diff
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/ubuntu/_base/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
index b4e71d35b..b4e71d35b 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+++ b/ubuntu/_base/dependencies/tqt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/series b/ubuntu/_base/dependencies/tqt3/debian/patches/series
index e6bdb92af..e6bdb92af 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/patches/series
+++ b/ubuntu/_base/dependencies/tqt3/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/qt_plugins_3.3rc b/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc
index e193b495c..e193b495c 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/qt_plugins_3.3rc
+++ b/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/qtrc b/ubuntu/_base/dependencies/tqt3/debian/qtrc
index 3c977f4d1..3c977f4d1 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/qtrc
+++ b/ubuntu/_base/dependencies/tqt3/debian/qtrc
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules
index 42593904d..42593904d 100755
--- a/ubuntu/maverick/dependencies/tqt3/debian/rules
+++ b/ubuntu/_base/dependencies/tqt3/debian/rules
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/source/format b/ubuntu/_base/dependencies/tqt3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/source/format
+++ b/ubuntu/_base/dependencies/tqt3/debian/source/format
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/source/options b/ubuntu/_base/dependencies/tqt3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/source/options
+++ b/ubuntu/_base/dependencies/tqt3/debian/source/options
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
index 97e2de476..97e2de476 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
index b62dc9759..b62dc9759 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install
index fa797854e..fa797854e 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.links
index 5244653a5..5244653a5 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.menu b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.menu
index d59f83bd0..d59f83bd0 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.menu
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.menu
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.postinst
index 041457133..041457133 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.postinst
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.postinst
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.prerm b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.prerm
index 36371091e..36371091e 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.prerm
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.prerm
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install
index 296634002..296634002 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.links
index 19922f299..19922f299 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.menu b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.menu
index be078bd49..be078bd49 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.menu
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.menu
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst
index 91d69ce08..91d69ce08 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.postinst
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.postinst
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.prerm b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.prerm
index 93376ef35..93376ef35 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.prerm
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.prerm
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
index 241ec8ee0..241ec8ee0 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-compat.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
index 38a249f41..38a249f41 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
index 72baff7fd..72baff7fd 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.install
index 3c795661b..3c795661b 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.links
index 073720d2b..073720d2b 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst
index b6c833de8..b6c833de8 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.postinst
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.postinst
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.prerm
index 0ec40c9e9..0ec40c9e9 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.prerm
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools.prerm
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.doc-base b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.doc-base
index 08f4fcdc3..08f4fcdc3 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.doc-base
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.doc-base
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.docs b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs
index f08fd0f02..f08fd0f02 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.docs
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.docs
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.links
index dfec5318b..dfec5318b 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-doc.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-doc.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install
index 8602850aa..8602850aa 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.links
index 4fa700555..4fa700555 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.menu b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.menu
index 976cb4b3c..976cb4b3c 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.menu
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.menu
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst
index 4c51e97bf..4c51e97bf 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.postinst
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.postinst
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.prerm b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.prerm
index 47d704eb8..47d704eb8 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.prerm
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.prerm
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install
index a1ae089bc..a1ae089bc 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.links
index eb6dd21c0..eb6dd21c0 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.links
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.links
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.menu b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.menu
index 79f2ff8e5..79f2ff8e5 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.menu
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.menu
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst
index 68671a6ef..68671a6ef 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.postinst
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.postinst
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.prerm b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.prerm
index 27f898ea3..27f898ea3 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.prerm
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.prerm
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/changelog b/ubuntu/_base/dependencies/tqtinterface/debian/changelog
index 460ca1061..460ca1061 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/changelog
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/changelog
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/compat b/ubuntu/_base/dependencies/tqtinterface/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/compat
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/compat
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/control b/ubuntu/_base/dependencies/tqtinterface/debian/control
index 8487c3d8d..8487c3d8d 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/control
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/control
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/copyright b/ubuntu/_base/dependencies/tqtinterface/debian/copyright
index 978e1bb3e..978e1bb3e 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/copyright
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/copyright
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/doc-base b/ubuntu/_base/dependencies/tqtinterface/debian/doc-base
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/doc-base
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/doc-base
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/docs b/ubuntu/_base/dependencies/tqtinterface/debian/docs
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/docs
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/docs
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface-dev.install b/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface-dev.install
index 8b19fb624..8b19fb624 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface-dev.install
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface-dev.install
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface.install b/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface.install
index f9610d9a2..f9610d9a2 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface.install
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/libtqtinterface.install
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/links b/ubuntu/_base/dependencies/tqtinterface/debian/links
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/links
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/links
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series b/ubuntu/_base/dependencies/tqtinterface/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/patches/series
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules
index eb10e465b..eb10e465b 100755
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/source/format b/ubuntu/_base/dependencies/tqtinterface/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/source/format
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/source/format
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/source/options b/ubuntu/_base/dependencies/tqtinterface/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/source/options
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/source/options
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/TODO b/ubuntu/_base/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/TODO
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/TODO
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/versions.pl b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog b/ubuntu/_base/libraries/kipi-plugins/debian/changelog
index cc84eae54..cc84eae54 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/changelog
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/compat b/ubuntu/_base/libraries/kipi-plugins/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/compat
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/compat
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/_base/libraries/kipi-plugins/debian/control
index 44eafdba5..44eafdba5 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/control
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/copyright b/ubuntu/_base/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/copyright
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/copyright
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/ubuntu/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index 458ab7b51..458ab7b51 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/ubuntu/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/ubuntu/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series b/ubuntu/_base/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/patches/series
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/rules b/ubuntu/_base/libraries/kipi-plugins/debian/rules
index 069780e39..069780e39 100755
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/rules
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/rules
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/source/format b/ubuntu/_base/libraries/kipi-plugins/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/source/format
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/source/format
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/source/options b/ubuntu/_base/libraries/kipi-plugins/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/source/options
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/source/options
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/watch b/ubuntu/_base/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/watch
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/watch
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..9f8f97776 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk
+++ b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/versions.pl b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/versions.pl
+++ b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/changelog b/ubuntu/_base/libraries/libkdcraw/debian/changelog
index 8e67c2b79..8e67c2b79 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/changelog
+++ b/ubuntu/_base/libraries/libkdcraw/debian/changelog
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/compat b/ubuntu/_base/libraries/libkdcraw/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/compat
+++ b/ubuntu/_base/libraries/libkdcraw/debian/compat
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/control b/ubuntu/_base/libraries/libkdcraw/debian/control
index 58d1ed716..58d1ed716 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/control
+++ b/ubuntu/_base/libraries/libkdcraw/debian/control
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/copyright b/ubuntu/_base/libraries/libkdcraw/debian/copyright
index 05b67ad60..05b67ad60 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/copyright
+++ b/ubuntu/_base/libraries/libkdcraw/debian/copyright
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/docs b/ubuntu/_base/libraries/libkdcraw/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/docs
+++ b/ubuntu/_base/libraries/libkdcraw/debian/docs
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/libkdcraw3-trinity-dev.install b/ubuntu/_base/libraries/libkdcraw/debian/libkdcraw3-trinity-dev.install
index c07b71b2d..c07b71b2d 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/libkdcraw3-trinity-dev.install
+++ b/ubuntu/_base/libraries/libkdcraw/debian/libkdcraw3-trinity-dev.install
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/libkdcraw3-trinity.install b/ubuntu/_base/libraries/libkdcraw/debian/libkdcraw3-trinity.install
index cdef643e7..cdef643e7 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/libkdcraw3-trinity.install
+++ b/ubuntu/_base/libraries/libkdcraw/debian/libkdcraw3-trinity.install
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/rules b/ubuntu/_base/libraries/libkdcraw/debian/rules
index bdf76c112..bdf76c112 100755
--- a/ubuntu/maverick/libraries/libkdcraw/debian/rules
+++ b/ubuntu/_base/libraries/libkdcraw/debian/rules
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/source/format b/ubuntu/_base/libraries/libkdcraw/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/source/format
+++ b/ubuntu/_base/libraries/libkdcraw/debian/source/format
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/source/options b/ubuntu/_base/libraries/libkdcraw/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/source/options
+++ b/ubuntu/_base/libraries/libkdcraw/debian/source/options
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/watch b/ubuntu/_base/libraries/libkdcraw/debian/watch
index ba648e43d..ba648e43d 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/watch
+++ b/ubuntu/_base/libraries/libkdcraw/debian/watch
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/README.Debian b/ubuntu/_base/libraries/libkexiv2/debian/README.Debian
index b49d315a1..b49d315a1 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/README.Debian
+++ b/ubuntu/_base/libraries/libkexiv2/debian/README.Debian
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk
+++ b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/versions.pl b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/versions.pl
+++ b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/changelog b/ubuntu/_base/libraries/libkexiv2/debian/changelog
index 9070cbb58..9070cbb58 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/changelog
+++ b/ubuntu/_base/libraries/libkexiv2/debian/changelog
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/compat b/ubuntu/_base/libraries/libkexiv2/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/compat
+++ b/ubuntu/_base/libraries/libkexiv2/debian/compat
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/control b/ubuntu/_base/libraries/libkexiv2/debian/control
index 63fb1eea0..63fb1eea0 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/control
+++ b/ubuntu/_base/libraries/libkexiv2/debian/control
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/copyright b/ubuntu/_base/libraries/libkexiv2/debian/copyright
index 2e711aec5..2e711aec5 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/copyright
+++ b/ubuntu/_base/libraries/libkexiv2/debian/copyright
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/libkexiv2-3-trinity-dev.install b/ubuntu/_base/libraries/libkexiv2/debian/libkexiv2-3-trinity-dev.install
index 1333fe738..1333fe738 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/libkexiv2-3-trinity-dev.install
+++ b/ubuntu/_base/libraries/libkexiv2/debian/libkexiv2-3-trinity-dev.install
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/libkexiv2-3-trinity.install b/ubuntu/_base/libraries/libkexiv2/debian/libkexiv2-3-trinity.install
index 11882501a..11882501a 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/libkexiv2-3-trinity.install
+++ b/ubuntu/_base/libraries/libkexiv2/debian/libkexiv2-3-trinity.install
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/patches/.gitignore b/ubuntu/_base/libraries/libkexiv2/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/patches/.gitignore
+++ b/ubuntu/_base/libraries/libkexiv2/debian/patches/.gitignore
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/rules b/ubuntu/_base/libraries/libkexiv2/debian/rules
index e5c16cf8a..e5c16cf8a 100755
--- a/ubuntu/maverick/libraries/libkexiv2/debian/rules
+++ b/ubuntu/_base/libraries/libkexiv2/debian/rules
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/source/format b/ubuntu/_base/libraries/libkexiv2/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/source/format
+++ b/ubuntu/_base/libraries/libkexiv2/debian/source/format
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/source/options b/ubuntu/_base/libraries/libkexiv2/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/source/options
+++ b/ubuntu/_base/libraries/libkexiv2/debian/source/options
diff --git a/ubuntu/maverick/libraries/libkipi/debian/README.Debian b/ubuntu/_base/libraries/libkipi/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/README.Debian
+++ b/ubuntu/_base/libraries/libkipi/debian/README.Debian
diff --git a/ubuntu/maverick/libraries/libkipi/debian/TODO b/ubuntu/_base/libraries/libkipi/debian/TODO
index 383c04cea..383c04cea 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/TODO
+++ b/ubuntu/_base/libraries/libkipi/debian/TODO
diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/_base/libraries/libkipi/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk
+++ b/ubuntu/_base/libraries/libkipi/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/versions.pl b/ubuntu/_base/libraries/libkipi/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/versions.pl
+++ b/ubuntu/_base/libraries/libkipi/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/libraries/libkipi/debian/changelog b/ubuntu/_base/libraries/libkipi/debian/changelog
index a08df16a5..a08df16a5 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/changelog
+++ b/ubuntu/_base/libraries/libkipi/debian/changelog
diff --git a/ubuntu/maverick/libraries/libkipi/debian/compat b/ubuntu/_base/libraries/libkipi/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/compat
+++ b/ubuntu/_base/libraries/libkipi/debian/compat
diff --git a/ubuntu/maverick/libraries/libkipi/debian/control b/ubuntu/_base/libraries/libkipi/debian/control
index 787582eca..787582eca 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/control
+++ b/ubuntu/_base/libraries/libkipi/debian/control
diff --git a/ubuntu/maverick/libraries/libkipi/debian/copyright b/ubuntu/_base/libraries/libkipi/debian/copyright
index 46dc95db6..46dc95db6 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/copyright
+++ b/ubuntu/_base/libraries/libkipi/debian/copyright
diff --git a/ubuntu/maverick/libraries/libkipi/debian/libkipi0-trinity-dev.install b/ubuntu/_base/libraries/libkipi/debian/libkipi0-trinity-dev.install
index 1333fe738..1333fe738 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/libkipi0-trinity-dev.install
+++ b/ubuntu/_base/libraries/libkipi/debian/libkipi0-trinity-dev.install
diff --git a/ubuntu/maverick/libraries/libkipi/debian/libkipi0-trinity.install b/ubuntu/_base/libraries/libkipi/debian/libkipi0-trinity.install
index 6f99e7cb2..6f99e7cb2 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/libkipi0-trinity.install
+++ b/ubuntu/_base/libraries/libkipi/debian/libkipi0-trinity.install
diff --git a/ubuntu/maverick/libraries/libkipi/debian/patches/series b/ubuntu/_base/libraries/libkipi/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/patches/series
+++ b/ubuntu/_base/libraries/libkipi/debian/patches/series
diff --git a/ubuntu/maverick/libraries/libkipi/debian/rules b/ubuntu/_base/libraries/libkipi/debian/rules
index e5c16cf8a..e5c16cf8a 100755
--- a/ubuntu/maverick/libraries/libkipi/debian/rules
+++ b/ubuntu/_base/libraries/libkipi/debian/rules
diff --git a/ubuntu/maverick/libraries/libkipi/debian/source/format b/ubuntu/_base/libraries/libkipi/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/source/format
+++ b/ubuntu/_base/libraries/libkipi/debian/source/format
diff --git a/ubuntu/maverick/libraries/libkipi/debian/source/options b/ubuntu/_base/libraries/libkipi/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/source/options
+++ b/ubuntu/_base/libraries/libkipi/debian/source/options
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/changelog b/ubuntu/_base/libraries/libksquirrel/debian/changelog
index 8adf184a4..8adf184a4 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/changelog
+++ b/ubuntu/_base/libraries/libksquirrel/debian/changelog
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/compat b/ubuntu/_base/libraries/libksquirrel/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/compat
+++ b/ubuntu/_base/libraries/libksquirrel/debian/compat
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/control b/ubuntu/_base/libraries/libksquirrel/debian/control
index 033567bc1..033567bc1 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/control
+++ b/ubuntu/_base/libraries/libksquirrel/debian/control
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/copyright b/ubuntu/_base/libraries/libksquirrel/debian/copyright
index 7d13d101a..7d13d101a 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/copyright
+++ b/ubuntu/_base/libraries/libksquirrel/debian/copyright
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/libksquirrel-tools-trinity.install b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel-tools-trinity.install
index 70a5cfea3..70a5cfea3 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/libksquirrel-tools-trinity.install
+++ b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel-tools-trinity.install
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/libksquirrel-trinity-dev.install b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel-trinity-dev.install
index 1ca5e8e1f..1ca5e8e1f 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/libksquirrel-trinity-dev.install
+++ b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel-trinity-dev.install
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/libksquirrel0-trinity.install b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
index 9b1cac640..9b1cac640 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/libksquirrel0-trinity.install
+++ b/ubuntu/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
index 51c0b6a04..51c0b6a04 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
index df2cd06d1..df2cd06d1 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
index cfe155b5a..cfe155b5a 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
index 9ddc44614..9ddc44614 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
index 4b1477bef..4b1477bef 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
index 81ce62873..81ce62873 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
index 6b38ef8da..6b38ef8da 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
index 21109a348..21109a348 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
index 26aa84076..26aa84076 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
index fcd6d5171..fcd6d5171 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
index ba620502c..ba620502c 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
index d662bec23..d662bec23 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
index 585d8cb36..585d8cb36 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
index 7c0950acd..7c0950acd 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
index ddec06008..ddec06008 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
index 3148b5faa..3148b5faa 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1 b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
index 041fdb9ed..041fdb9ed 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
+++ b/ubuntu/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/patches/.gitignore b/ubuntu/_base/libraries/libksquirrel/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/patches/.gitignore
+++ b/ubuntu/_base/libraries/libksquirrel/debian/patches/.gitignore
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/rules b/ubuntu/_base/libraries/libksquirrel/debian/rules
index 15f00b785..15f00b785 100755
--- a/ubuntu/maverick/libraries/libksquirrel/debian/rules
+++ b/ubuntu/_base/libraries/libksquirrel/debian/rules
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/source/format b/ubuntu/_base/libraries/libksquirrel/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/source/format
+++ b/ubuntu/_base/libraries/libksquirrel/debian/source/format
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/source/options b/ubuntu/_base/libraries/libksquirrel/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/source/options
+++ b/ubuntu/_base/libraries/libksquirrel/debian/source/options
diff --git a/ubuntu/maverick/libraries/libksquirrel/debian/watch b/ubuntu/_base/libraries/libksquirrel/debian/watch
index d9b799728..d9b799728 100644
--- a/ubuntu/maverick/libraries/libksquirrel/debian/watch
+++ b/ubuntu/_base/libraries/libksquirrel/debian/watch
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-qt-kde.mk
index 60310a01a..60310a01a 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/cdbs/kde.mk b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/cdbs/kde.mk
+++ b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/cdbs/versions.pl b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/cdbs/versions.pl
+++ b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/changelog b/ubuntu/_base/libraries/libtdeldap/debian/changelog
index d564a4a8a..d564a4a8a 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/changelog
+++ b/ubuntu/_base/libraries/libtdeldap/debian/changelog
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/compat b/ubuntu/_base/libraries/libtdeldap/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/compat
+++ b/ubuntu/_base/libraries/libtdeldap/debian/compat
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/control b/ubuntu/_base/libraries/libtdeldap/debian/control
index 88c162050..88c162050 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/control
+++ b/ubuntu/_base/libraries/libtdeldap/debian/control
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/copyright b/ubuntu/_base/libraries/libtdeldap/debian/copyright
index 540709e87..540709e87 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/copyright
+++ b/ubuntu/_base/libraries/libtdeldap/debian/copyright
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/docs b/ubuntu/_base/libraries/libtdeldap/debian/docs
index 62deb0497..62deb0497 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/docs
+++ b/ubuntu/_base/libraries/libtdeldap/debian/docs
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install b/ubuntu/_base/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install
index 5b15c89d1..5b15c89d1 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install
+++ b/ubuntu/_base/libraries/libtdeldap/debian/libtdeldap-trinity-dev.install
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/libtdeldap-trinity.install b/ubuntu/_base/libraries/libtdeldap/debian/libtdeldap-trinity.install
index 11882501a..11882501a 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/libtdeldap-trinity.install
+++ b/ubuntu/_base/libraries/libtdeldap/debian/libtdeldap-trinity.install
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/patches/series b/ubuntu/_base/libraries/libtdeldap/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/patches/series
+++ b/ubuntu/_base/libraries/libtdeldap/debian/patches/series
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/rules b/ubuntu/_base/libraries/libtdeldap/debian/rules
index 1934c8278..1934c8278 100755
--- a/ubuntu/maverick/libraries/libtdeldap/debian/rules
+++ b/ubuntu/_base/libraries/libtdeldap/debian/rules
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/source/format b/ubuntu/_base/libraries/libtdeldap/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/source/format
+++ b/ubuntu/_base/libraries/libtdeldap/debian/source/format
diff --git a/ubuntu/maverick/libraries/libtdeldap/debian/source/options b/ubuntu/_base/libraries/libtdeldap/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/libtdeldap/debian/source/options
+++ b/ubuntu/_base/libraries/libtdeldap/debian/source/options
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/changelog b/ubuntu/_base/libraries/libtqt-perl/debian/changelog
index c5a93479e..c5a93479e 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/changelog
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/changelog
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/compat b/ubuntu/_base/libraries/libtqt-perl/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/compat
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/compat
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/control b/ubuntu/_base/libraries/libtqt-perl/debian/control
index 58c1330af..58c1330af 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/control
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/control
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/copyright b/ubuntu/_base/libraries/libtqt-perl/debian/copyright
index ae0fd0e46..ae0fd0e46 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/copyright
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/copyright
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/docs b/ubuntu/_base/libraries/libtqt-perl/debian/docs
index 60566c90c..60566c90c 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/docs
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/docs
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/examples b/ubuntu/_base/libraries/libtqt-perl/debian/examples
index 50594b81e..50594b81e 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/examples
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/examples
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/manpages b/ubuntu/_base/libraries/libtqt-perl/debian/manpages
index d8b17c191..d8b17c191 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/manpages
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/manpages
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1 b/ubuntu/_base/libraries/libtqt-perl/debian/pqtapi.1
index f6005623a..f6005623a 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/pqtapi.1
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1 b/ubuntu/_base/libraries/libtqt-perl/debian/pqtsh.1
index 19c7a93a0..19c7a93a0 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/pqtsh.1
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/puic.1 b/ubuntu/_base/libraries/libtqt-perl/debian/puic.1
index 671bd97fd..671bd97fd 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/puic.1
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/puic.1
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/rules b/ubuntu/_base/libraries/libtqt-perl/debian/rules
index 28a9c7817..28a9c7817 100755
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/rules
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/rules
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/source/format b/ubuntu/_base/libraries/libtqt-perl/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/source/format
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/source/format
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/source/options b/ubuntu/_base/libraries/libtqt-perl/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/source/options
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/source/options
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/watch b/ubuntu/_base/libraries/libtqt-perl/debian/watch
index 18c470968..18c470968 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/watch
+++ b/ubuntu/_base/libraries/libtqt-perl/debian/watch
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/README.Debian b/ubuntu/_base/libraries/pytdeextensions/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/README.Debian
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/README.Debian
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/changelog b/ubuntu/_base/libraries/pytdeextensions/debian/changelog
index cf8999ac1..cf8999ac1 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/changelog
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/changelog
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/compat b/ubuntu/_base/libraries/pytdeextensions/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/compat
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/compat
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/_base/libraries/pytdeextensions/debian/control
index b1ba63aaf..b1ba63aaf 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/control
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/control
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/copyright b/ubuntu/_base/libraries/pytdeextensions/debian/copyright
index 9ed7bf6cd..9ed7bf6cd 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/copyright
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/copyright
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/docs b/ubuntu/_base/libraries/pytdeextensions/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/docs
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/docs
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/_base/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
index 5e9fd1f3e..5e9fd1f3e 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity.install b/ubuntu/_base/libraries/pytdeextensions/debian/libpythonize0-trinity.install
index 48601d2d0..48601d2d0 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity.install
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/libpythonize0-trinity.install
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/patches/.gitignore b/ubuntu/_base/libraries/pytdeextensions/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/patches/.gitignore
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/patches/.gitignore
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/ubuntu/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index 3a65ff190..3a65ff190 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/patches/series b/ubuntu/_base/libraries/pytdeextensions/debian/patches/series
index 4e4c2c945..4e4c2c945 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/patches/series
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/patches/series
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pycompat b/ubuntu/_base/libraries/pytdeextensions/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pycompat
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/pycompat
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install b/ubuntu/_base/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
index 1d69ae1ee..1d69ae1ee 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/pytdeextensions-trinity.install
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides b/ubuntu/_base/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
index 7cd5d5817..7cd5d5817 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/_base/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
index 1a1ec9a8e..1a1ec9a8e 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/python-distutils-jaunty.mk
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/pyversions b/ubuntu/_base/libraries/pytdeextensions/debian/pyversions
index b3dc41ebc..b3dc41ebc 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/pyversions
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/pyversions
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/rules b/ubuntu/_base/libraries/pytdeextensions/debian/rules
index 188238d79..188238d79 100755
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/rules
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/source/format b/ubuntu/_base/libraries/pytdeextensions/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/source/format
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/source/format
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/source/options b/ubuntu/_base/libraries/pytdeextensions/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/source/options
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/source/options
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/NEWS.Debian b/ubuntu/_base/libraries/python-trinity/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/NEWS.Debian
+++ b/ubuntu/_base/libraries/python-trinity/debian/NEWS.Debian
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/changelog b/ubuntu/_base/libraries/python-trinity/debian/changelog
index 12485eccd..12485eccd 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/changelog
+++ b/ubuntu/_base/libraries/python-trinity/debian/changelog
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/compat b/ubuntu/_base/libraries/python-trinity/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/compat
+++ b/ubuntu/_base/libraries/python-trinity/debian/compat
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/_base/libraries/python-trinity/debian/control
index 86335497a..86335497a 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/control
+++ b/ubuntu/_base/libraries/python-trinity/debian/control
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/copyright b/ubuntu/_base/libraries/python-trinity/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/copyright
+++ b/ubuntu/_base/libraries/python-trinity/debian/copyright
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/patches/.gitignore b/ubuntu/_base/libraries/python-trinity/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/patches/.gitignore
+++ b/ubuntu/_base/libraries/python-trinity/debian/patches/.gitignore
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py b/ubuntu/_base/libraries/python-trinity/debian/pytdeconfig.py
index eac264752..eac264752 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/pytdeconfig.py
+++ b/ubuntu/_base/libraries/python-trinity/debian/pytdeconfig.py
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
index c395de89f..c395de89f 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
index f7d970bcb..f7d970bcb 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
index 96235463f..96235463f 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
index bb9705168..bb9705168 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
index 20b273acb..20b273acb 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity-doc.install
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install
index facee2907..facee2907 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-trinity.install
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/_base/libraries/python-trinity/debian/rules
index a8bd862cd..a8bd862cd 100755
--- a/ubuntu/maverick/libraries/python-trinity/debian/rules
+++ b/ubuntu/_base/libraries/python-trinity/debian/rules
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/source/format b/ubuntu/_base/libraries/python-trinity/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/source/format
+++ b/ubuntu/_base/libraries/python-trinity/debian/source/format
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/source/options b/ubuntu/_base/libraries/python-trinity/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/source/options
+++ b/ubuntu/_base/libraries/python-trinity/debian/source/options
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/watch b/ubuntu/_base/libraries/python-trinity/debian/watch
index 8b3afcac0..8b3afcac0 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/watch
+++ b/ubuntu/_base/libraries/python-trinity/debian/watch
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/changelog b/ubuntu/_base/metapackages/casper-trinity/debian/changelog
index 28cd74d10..28cd74d10 100644
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/changelog
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/changelog
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/compat b/ubuntu/_base/metapackages/casper-trinity/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/compat
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/compat
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/control b/ubuntu/_base/metapackages/casper-trinity/debian/control
index 433197e45..433197e45 100644
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/control
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/control
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/copyright b/ubuntu/_base/metapackages/casper-trinity/debian/copyright
index a866ee13d..a866ee13d 100644
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/copyright
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/copyright
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity b/ubuntu/_base/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
index a018471b7..a018471b7 100755
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity b/ubuntu/_base/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
index bd764edcc..bd764edcc 100755
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/install b/ubuntu/_base/metapackages/casper-trinity/debian/install
index fc8f31aa9..fc8f31aa9 100644
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/install
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/install
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/rules b/ubuntu/_base/metapackages/casper-trinity/debian/rules
index e6b6748ab..e6b6748ab 100755
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/rules
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/rules
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/source/format b/ubuntu/_base/metapackages/casper-trinity/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/source/format
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/source/format
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/source/options b/ubuntu/_base/metapackages/casper-trinity/debian/source/options
index d71748bba..d71748bba 100644
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/source/options
+++ b/ubuntu/_base/metapackages/casper-trinity/debian/source/options
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog b/ubuntu/_base/metapackages/kubuntu-meta/debian/changelog
index fcdf17376..fcdf17376 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/changelog
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/compat b/ubuntu/_base/metapackages/kubuntu-meta/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/compat
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/compat
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/_base/metapackages/kubuntu-meta/debian/control
index a0da24944..a0da24944 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/control
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/copyright b/ubuntu/_base/metapackages/kubuntu-meta/debian/copyright
index 1cc9d090e..1cc9d090e 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/copyright
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/copyright
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/COPYING b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/COPYING
index d511905c1..d511905c1 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/COPYING
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/COPYING
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/README
index 8b1378917..8b1378917 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/README
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
index 66762e775..66762e775 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
index 846c7732a..846c7732a 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
index bf543b510..bf543b510 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
index bf543b510..bf543b510 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
index bf543b510..bf543b510 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
index 1f41663e7..1f41663e7 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
index 385fdf0e8..385fdf0e8 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-suggests-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-suggests-all
index fe1bb2131..fe1bb2131 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-suggests-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-suggests-all
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules b/ubuntu/_base/metapackages/kubuntu-meta/debian/rules
index 4ab7baa9d..4ab7baa9d 100755
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/rules
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/source/format b/ubuntu/_base/metapackages/kubuntu-meta/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/source/format
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/source/format
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/source/options b/ubuntu/_base/metapackages/kubuntu-meta/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/source/options
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/source/options
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/changelog b/ubuntu/_base/metapackages/rename-meta/debian/changelog
index adf2ec8c1..adf2ec8c1 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/changelog
+++ b/ubuntu/_base/metapackages/rename-meta/debian/changelog
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/compat b/ubuntu/_base/metapackages/rename-meta/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/compat
+++ b/ubuntu/_base/metapackages/rename-meta/debian/compat
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/_base/metapackages/rename-meta/debian/control
index f05b7c707..f05b7c707 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/control
+++ b/ubuntu/_base/metapackages/rename-meta/debian/control
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/dirs b/ubuntu/_base/metapackages/rename-meta/debian/dirs
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/dirs
+++ b/ubuntu/_base/metapackages/rename-meta/debian/dirs
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.preinst b/ubuntu/_base/metapackages/rename-meta/debian/kdm-trinity.preinst
index 2f41409d1..2f41409d1 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.preinst
+++ b/ubuntu/_base/metapackages/rename-meta/debian/kdm-trinity.preinst
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/rules b/ubuntu/_base/metapackages/rename-meta/debian/rules
index 7cd7dde2f..7cd7dde2f 100755
--- a/ubuntu/maverick/metapackages/rename-meta/debian/rules
+++ b/ubuntu/_base/metapackages/rename-meta/debian/rules
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/source/format b/ubuntu/_base/metapackages/rename-meta/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/source/format
+++ b/ubuntu/_base/metapackages/rename-meta/debian/source/format
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/source/options b/ubuntu/_base/metapackages/rename-meta/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/source/options
+++ b/ubuntu/_base/metapackages/rename-meta/debian/source/options
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/changelog b/ubuntu/_base/metapackages/sudo-trinity/debian/changelog
index 6d79a642a..6d79a642a 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/changelog
+++ b/ubuntu/_base/metapackages/sudo-trinity/debian/changelog
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/compat b/ubuntu/_base/metapackages/sudo-trinity/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/compat
+++ b/ubuntu/_base/metapackages/sudo-trinity/debian/compat
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/control b/ubuntu/_base/metapackages/sudo-trinity/debian/control
index bff80374f..bff80374f 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/control
+++ b/ubuntu/_base/metapackages/sudo-trinity/debian/control
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/dirs b/ubuntu/_base/metapackages/sudo-trinity/debian/dirs
index ee19d5d17..ee19d5d17 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/dirs
+++ b/ubuntu/_base/metapackages/sudo-trinity/debian/dirs
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/distrospecific/Makefile b/ubuntu/_base/metapackages/sudo-trinity/debian/distrospecific/Makefile
index f106ff05e..f106ff05e 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/distrospecific/Makefile
+++ b/ubuntu/_base/metapackages/sudo-trinity/debian/distrospecific/Makefile
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path b/ubuntu/_base/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
+++ b/ubuntu/_base/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/rules b/ubuntu/_base/metapackages/sudo-trinity/debian/rules
index e5e2870b7..e5e2870b7 100755
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/rules
+++ b/ubuntu/_base/metapackages/sudo-trinity/debian/rules
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/source/format b/ubuntu/_base/metapackages/sudo-trinity/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/source/format
+++ b/ubuntu/_base/metapackages/sudo-trinity/debian/source/format
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/source/options b/ubuntu/_base/metapackages/sudo-trinity/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/source/options
+++ b/ubuntu/_base/metapackages/sudo-trinity/debian/source/options
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/changelog b/ubuntu/_base/metapackages/synaptic-trinity/debian/changelog
index 7c4af03d7..7c4af03d7 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/changelog
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/changelog
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/compat b/ubuntu/_base/metapackages/synaptic-trinity/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/compat
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/compat
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/control b/ubuntu/_base/metapackages/synaptic-trinity/debian/control
index 422c3bd03..422c3bd03 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/control
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/control
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/copyright b/ubuntu/_base/metapackages/synaptic-trinity/debian/copyright
index d934ced33..d934ced33 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/copyright
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/copyright
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop b/ubuntu/_base/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
index 7866d6869..7866d6869 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/distrospecific/synaptic-tde.desktop
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop b/ubuntu/_base/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
index 4a2c1f867..4a2c1f867 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/distrospecific/synaptic.desktop
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/install b/ubuntu/_base/metapackages/synaptic-trinity/debian/install
index 4a167e5fa..4a167e5fa 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/install
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/install
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm b/ubuntu/_base/metapackages/synaptic-trinity/debian/postrm
index 840ae090e..840ae090e 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/postrm
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/postrm
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst b/ubuntu/_base/metapackages/synaptic-trinity/debian/preinst
index 209296dbd..209296dbd 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/preinst
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/preinst
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/rules b/ubuntu/_base/metapackages/synaptic-trinity/debian/rules
index 187d68f00..187d68f00 100755
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/rules
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/rules
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/format b/ubuntu/_base/metapackages/synaptic-trinity/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/format
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/source/format
diff --git a/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/options b/ubuntu/_base/metapackages/synaptic-trinity/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/metapackages/synaptic-trinity/debian/source/options
+++ b/ubuntu/_base/metapackages/synaptic-trinity/debian/source/options
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/changelog b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/changelog
index c0e67bf63..c0e67bf63 100755
--- a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/changelog
+++ b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/changelog
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/compat b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/compat
index 7f8f011eb..7f8f011eb 100755
--- a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/compat
+++ b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/compat
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/control b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/control
index 188f5011c..188f5011c 100755
--- a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/control
+++ b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/control
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/dirs b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/dirs
index ee19d5d17..ee19d5d17 100755
--- a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/dirs
+++ b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/dirs
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/Makefile b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/Makefile
index 2da7146a3..2da7146a3 100755
--- a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/Makefile
+++ b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/Makefile
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
index 7720f1ca8..7720f1ca8 100644
--- a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
+++ b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/distrospecific/etc/xdg/autostart/polkit-tde-authentication-agent-1.desktop
diff --git a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/rules b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules
index e6b6748ab..e6b6748ab 100755
--- a/ubuntu/maverick/metapackages/tde-ubuntu-integration/debian/rules
+++ b/ubuntu/_base/metapackages/tde-ubuntu-integration/debian/rules
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/changelog b/ubuntu/_base/metapackages/trinity-apt-archive/debian/changelog
index 73f3f2324..73f3f2324 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/changelog
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/changelog
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/compat b/ubuntu/_base/metapackages/trinity-apt-archive/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/compat
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/compat
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control b/ubuntu/_base/metapackages/trinity-apt-archive/debian/control
index dab80544f..dab80544f 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/control
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/copyright b/ubuntu/_base/metapackages/trinity-apt-archive/debian/copyright
index 81235ac6d..81235ac6d 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/copyright
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/copyright
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list b/ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
index 9b5333714..9b5333714 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/install b/ubuntu/_base/metapackages/trinity-apt-archive/debian/install
index 1246138c5..1246138c5 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/install
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/install
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/postinst b/ubuntu/_base/metapackages/trinity-apt-archive/debian/postinst
index 0319ce224..0319ce224 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/postinst
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/postinst
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/prerm b/ubuntu/_base/metapackages/trinity-apt-archive/debian/prerm
index 763b8cf65..763b8cf65 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/prerm
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/prerm
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/rules b/ubuntu/_base/metapackages/trinity-apt-archive/debian/rules
index 311f254a1..311f254a1 100755
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/rules
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/rules
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/format b/ubuntu/_base/metapackages/trinity-apt-archive/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/format
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/source/format
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/options b/ubuntu/_base/metapackages/trinity-apt-archive/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/options
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/source/options
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/changelog b/ubuntu/_base/metapackages/trinity-keyring/debian/changelog
index 4073eea7f..4073eea7f 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/changelog
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/changelog
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/compat b/ubuntu/_base/metapackages/trinity-keyring/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/compat
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/compat
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/control b/ubuntu/_base/metapackages/trinity-keyring/debian/control
index 8cb0d0aac..8cb0d0aac 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/control
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/control
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/copyright b/ubuntu/_base/metapackages/trinity-keyring/debian/copyright
index d934ced33..d934ced33 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/copyright
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/copyright
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg
index d703b13cc..d703b13cc 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg
index 8147d55e5..8147d55e5 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
index 4498a51e8..4498a51e8 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/install b/ubuntu/_base/metapackages/trinity-keyring/debian/install
index b3a5bac5c..b3a5bac5c 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/install
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/install
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/preinst b/ubuntu/_base/metapackages/trinity-keyring/debian/preinst
index 53c7d0cbc..53c7d0cbc 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/preinst
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/preinst
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules b/ubuntu/_base/metapackages/trinity-keyring/debian/rules
index e2df3ba49..e2df3ba49 100755
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/rules
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/source/format b/ubuntu/_base/metapackages/trinity-keyring/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/source/format
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/source/format
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/source/options b/ubuntu/_base/metapackages/trinity-keyring/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/source/options
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/source/options
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/changelog b/ubuntu/_base/metapackages/trinity-livecd/debian/changelog
index 33cd71ed3..33cd71ed3 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/changelog
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/changelog
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/compat b/ubuntu/_base/metapackages/trinity-livecd/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/compat
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/compat
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/control b/ubuntu/_base/metapackages/trinity-livecd/debian/control
index 21f424904..21f424904 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/control
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/copyright b/ubuntu/_base/metapackages/trinity-livecd/debian/copyright
index 1cc9d090e..1cc9d090e 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/copyright
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/copyright
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/rules b/ubuntu/_base/metapackages/trinity-livecd/debian/rules
index 3591ab5e4..3591ab5e4 100755
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/rules
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/rules
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/source/format b/ubuntu/_base/metapackages/trinity-livecd/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/source/format
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/source/format
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/source/options b/ubuntu/_base/metapackages/trinity-livecd/debian/source/options
index d71748bba..d71748bba 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/source/options
+++ b/ubuntu/_base/metapackages/trinity-livecd/debian/source/options
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/changelog b/ubuntu/_base/metapackages/ubiquity-trinity/debian/changelog
index 2b5f57a68..2b5f57a68 100644
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/changelog
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/changelog
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/compat b/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/compat
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/compat
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/control b/ubuntu/_base/metapackages/ubiquity-trinity/debian/control
index 3edef9d2b..3edef9d2b 100644
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/control
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/control
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/copyright b/ubuntu/_base/metapackages/ubiquity-trinity/debian/copyright
index a866ee13d..a866ee13d 100644
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/copyright
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/copyright
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity b/ubuntu/_base/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
index e31165c02..e31165c02 100755
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/install b/ubuntu/_base/metapackages/ubiquity-trinity/debian/install
index 2f8bf51a5..2f8bf51a5 100644
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/install
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/install
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/rules b/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules
index e6b6748ab..e6b6748ab 100755
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/rules
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/rules
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/source/format b/ubuntu/_base/metapackages/ubiquity-trinity/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/source/format
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/source/format
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/source/options b/ubuntu/_base/metapackages/ubiquity-trinity/debian/source/options
index d71748bba..d71748bba 100644
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/source/options
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/debian/source/options
diff --git a/ubuntu/maverick/tde-i18n/debian/changelog b/ubuntu/_base/tde-i18n/debian/changelog
index a052e9ce9..a052e9ce9 100644
--- a/ubuntu/maverick/tde-i18n/debian/changelog
+++ b/ubuntu/_base/tde-i18n/debian/changelog
diff --git a/ubuntu/maverick/tde-i18n/debian/compat b/ubuntu/_base/tde-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tde-i18n/debian/compat
+++ b/ubuntu/_base/tde-i18n/debian/compat
diff --git a/ubuntu/maverick/tde-i18n/debian/control b/ubuntu/_base/tde-i18n/debian/control
index b0f96bde2..b0f96bde2 100644
--- a/ubuntu/maverick/tde-i18n/debian/control
+++ b/ubuntu/_base/tde-i18n/debian/control
diff --git a/ubuntu/maverick/tde-i18n/debian/copyright b/ubuntu/_base/tde-i18n/debian/copyright
index 7b6fde481..7b6fde481 100644
--- a/ubuntu/maverick/tde-i18n/debian/copyright
+++ b/ubuntu/_base/tde-i18n/debian/copyright
diff --git a/ubuntu/maverick/tde-i18n/debian/rules b/ubuntu/_base/tde-i18n/debian/rules
index c5ae84be2..c5ae84be2 100755
--- a/ubuntu/maverick/tde-i18n/debian/rules
+++ b/ubuntu/_base/tde-i18n/debian/rules
diff --git a/ubuntu/maverick/tde-i18n/debian/source/format b/ubuntu/_base/tde-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tde-i18n/debian/source/format
+++ b/ubuntu/_base/tde-i18n/debian/source/format
diff --git a/ubuntu/maverick/tde-i18n/debian/source/options b/ubuntu/_base/tde-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tde-i18n/debian/source/options
+++ b/ubuntu/_base/tde-i18n/debian/source/options
diff --git a/ubuntu/maverick/tdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES
index fe338c20b..fe338c20b 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
index 91a547ea9..91a547ea9 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk b/ubuntu/_base/tdeaccessibility/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdeaccessibility/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/versions.pl b/ubuntu/_base/tdeaccessibility/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdeaccessibility/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdeaccessibility/debian/changelog b/ubuntu/_base/tdeaccessibility/debian/changelog
index fd08811f2..fd08811f2 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/changelog
+++ b/ubuntu/_base/tdeaccessibility/debian/changelog
diff --git a/ubuntu/maverick/tdeaccessibility/debian/compat b/ubuntu/_base/tdeaccessibility/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/compat
+++ b/ubuntu/_base/tdeaccessibility/debian/compat
diff --git a/ubuntu/maverick/tdeaccessibility/debian/control b/ubuntu/_base/tdeaccessibility/debian/control
index 8bb889937..8bb889937 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/control
+++ b/ubuntu/_base/tdeaccessibility/debian/control
diff --git a/ubuntu/maverick/tdeaccessibility/debian/copyright b/ubuntu/_base/tdeaccessibility/debian/copyright
index a5ae39688..a5ae39688 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/copyright
+++ b/ubuntu/_base/tdeaccessibility/debian/copyright
diff --git a/ubuntu/maverick/tdeaccessibility/debian/icons/kmag-16.xpm b/ubuntu/_base/tdeaccessibility/debian/icons/kmag-16.xpm
index 4fd4e826a..4fd4e826a 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/icons/kmag-16.xpm
+++ b/ubuntu/_base/tdeaccessibility/debian/icons/kmag-16.xpm
diff --git a/ubuntu/maverick/tdeaccessibility/debian/icons/kmag.xpm b/ubuntu/_base/tdeaccessibility/debian/icons/kmag.xpm
index 5f7bcea45..5f7bcea45 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/icons/kmag.xpm
+++ b/ubuntu/_base/tdeaccessibility/debian/icons/kmag.xpm
diff --git a/ubuntu/maverick/tdeaccessibility/debian/icons/kmousetool-16.xpm b/ubuntu/_base/tdeaccessibility/debian/icons/kmousetool-16.xpm
index 74a11e135..74a11e135 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/icons/kmousetool-16.xpm
+++ b/ubuntu/_base/tdeaccessibility/debian/icons/kmousetool-16.xpm
diff --git a/ubuntu/maverick/tdeaccessibility/debian/icons/kmousetool.xpm b/ubuntu/_base/tdeaccessibility/debian/icons/kmousetool.xpm
index 0a25d71f1..0a25d71f1 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/icons/kmousetool.xpm
+++ b/ubuntu/_base/tdeaccessibility/debian/icons/kmousetool.xpm
diff --git a/ubuntu/maverick/tdeaccessibility/debian/icons/kmouth-16.xpm b/ubuntu/_base/tdeaccessibility/debian/icons/kmouth-16.xpm
index dc538ae44..dc538ae44 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/icons/kmouth-16.xpm
+++ b/ubuntu/_base/tdeaccessibility/debian/icons/kmouth-16.xpm
diff --git a/ubuntu/maverick/tdeaccessibility/debian/icons/kmouth.xpm b/ubuntu/_base/tdeaccessibility/debian/icons/kmouth.xpm
index b0b027449..b0b027449 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/icons/kmouth.xpm
+++ b/ubuntu/_base/tdeaccessibility/debian/icons/kmouth.xpm
diff --git a/ubuntu/maverick/tdeaccessibility/debian/icons/ksayit-16.xpm b/ubuntu/_base/tdeaccessibility/debian/icons/ksayit-16.xpm
index 3f4ed6de3..3f4ed6de3 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/icons/ksayit-16.xpm
+++ b/ubuntu/_base/tdeaccessibility/debian/icons/ksayit-16.xpm
diff --git a/ubuntu/maverick/tdeaccessibility/debian/icons/ksayit.xpm b/ubuntu/_base/tdeaccessibility/debian/icons/ksayit.xpm
index a89efc70f..a89efc70f 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/icons/ksayit.xpm
+++ b/ubuntu/_base/tdeaccessibility/debian/icons/ksayit.xpm
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kbstate-trinity.install b/ubuntu/_base/tdeaccessibility/debian/kbstate-trinity.install
index a5c05d80c..a5c05d80c 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kbstate-trinity.install
+++ b/ubuntu/_base/tdeaccessibility/debian/kbstate-trinity.install
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.install b/ubuntu/_base/tdeaccessibility/debian/kmag-trinity.install
index 23013e6da..23013e6da 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.install
+++ b/ubuntu/_base/tdeaccessibility/debian/kmag-trinity.install
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.manpages b/ubuntu/_base/tdeaccessibility/debian/kmag-trinity.manpages
index 6579ddb0f..6579ddb0f 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.manpages
+++ b/ubuntu/_base/tdeaccessibility/debian/kmag-trinity.manpages
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.menu b/ubuntu/_base/tdeaccessibility/debian/kmag-trinity.menu
index acfc441ca..acfc441ca 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmag-trinity.menu
+++ b/ubuntu/_base/tdeaccessibility/debian/kmag-trinity.menu
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.install b/ubuntu/_base/tdeaccessibility/debian/kmousetool-trinity.install
index cc13c6d89..cc13c6d89 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.install
+++ b/ubuntu/_base/tdeaccessibility/debian/kmousetool-trinity.install
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.manpages b/ubuntu/_base/tdeaccessibility/debian/kmousetool-trinity.manpages
index 4ebe07483..4ebe07483 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.manpages
+++ b/ubuntu/_base/tdeaccessibility/debian/kmousetool-trinity.manpages
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.menu b/ubuntu/_base/tdeaccessibility/debian/kmousetool-trinity.menu
index c4ea322ae..c4ea322ae 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmousetool-trinity.menu
+++ b/ubuntu/_base/tdeaccessibility/debian/kmousetool-trinity.menu
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.install b/ubuntu/_base/tdeaccessibility/debian/kmouth-trinity.install
index 546b65791..546b65791 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.install
+++ b/ubuntu/_base/tdeaccessibility/debian/kmouth-trinity.install
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.manpages b/ubuntu/_base/tdeaccessibility/debian/kmouth-trinity.manpages
index b459b0888..b459b0888 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.manpages
+++ b/ubuntu/_base/tdeaccessibility/debian/kmouth-trinity.manpages
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.menu b/ubuntu/_base/tdeaccessibility/debian/kmouth-trinity.menu
index 496141783..496141783 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kmouth-trinity.menu
+++ b/ubuntu/_base/tdeaccessibility/debian/kmouth-trinity.menu
diff --git a/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.install b/ubuntu/_base/tdeaccessibility/debian/ksayit-trinity.install
index 010831729..010831729 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.install
+++ b/ubuntu/_base/tdeaccessibility/debian/ksayit-trinity.install
diff --git a/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.menu b/ubuntu/_base/tdeaccessibility/debian/ksayit-trinity.menu
index e2cd5a697..e2cd5a697 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.menu
+++ b/ubuntu/_base/tdeaccessibility/debian/ksayit-trinity.menu
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-contrib-plugins-trinity.install b/ubuntu/_base/tdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
index 698f85fe2..698f85fe2 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
+++ b/ubuntu/_base/tdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install b/ubuntu/_base/tdeaccessibility/debian/kttsd-trinity.install
index 2ad412a7f..2ad412a7f 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install
+++ b/ubuntu/_base/tdeaccessibility/debian/kttsd-trinity.install
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/ubuntu/_base/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
index 3e0bd4dc3..3e0bd4dc3 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
+++ b/ubuntu/_base/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/ubuntu/_base/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
index 3e0bd4dc3..3e0bd4dc3 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
+++ b/ubuntu/_base/tdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kttsd.README.Debian b/ubuntu/_base/tdeaccessibility/debian/kttsd.README.Debian
index cb410bd54..cb410bd54 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kttsd.README.Debian
+++ b/ubuntu/_base/tdeaccessibility/debian/kttsd.README.Debian
diff --git a/ubuntu/maverick/tdeaccessibility/debian/man/kdeopt-trinity.part b/ubuntu/_base/tdeaccessibility/debian/man/kdeopt-trinity.part
index 37fdfded7..37fdfded7 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/man/kdeopt-trinity.part
+++ b/ubuntu/_base/tdeaccessibility/debian/man/kdeopt-trinity.part
diff --git a/ubuntu/maverick/tdeaccessibility/debian/man/kmag-trinity.man b/ubuntu/_base/tdeaccessibility/debian/man/kmag-trinity.man
index 1f7debb82..1f7debb82 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/man/kmag-trinity.man
+++ b/ubuntu/_base/tdeaccessibility/debian/man/kmag-trinity.man
diff --git a/ubuntu/maverick/tdeaccessibility/debian/man/kmousetool-trinity.man b/ubuntu/_base/tdeaccessibility/debian/man/kmousetool-trinity.man
index 4a4d6b411..4a4d6b411 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/man/kmousetool-trinity.man
+++ b/ubuntu/_base/tdeaccessibility/debian/man/kmousetool-trinity.man
diff --git a/ubuntu/maverick/tdeaccessibility/debian/man/kmouth-trinity.man b/ubuntu/_base/tdeaccessibility/debian/man/kmouth-trinity.man
index ce2a38b5d..ce2a38b5d 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/man/kmouth-trinity.man
+++ b/ubuntu/_base/tdeaccessibility/debian/man/kmouth-trinity.man
diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/series b/ubuntu/_base/tdeaccessibility/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/patches/series
+++ b/ubuntu/_base/tdeaccessibility/debian/patches/series
diff --git a/ubuntu/maverick/tdeaccessibility/debian/rules b/ubuntu/_base/tdeaccessibility/debian/rules
index 2807df3d3..2807df3d3 100755
--- a/ubuntu/maverick/tdeaccessibility/debian/rules
+++ b/ubuntu/_base/tdeaccessibility/debian/rules
diff --git a/ubuntu/maverick/tdeaccessibility/debian/source/format b/ubuntu/_base/tdeaccessibility/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/source/format
+++ b/ubuntu/_base/tdeaccessibility/debian/source/format
diff --git a/ubuntu/maverick/tdeaccessibility/debian/source/options b/ubuntu/_base/tdeaccessibility/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/source/options
+++ b/ubuntu/_base/tdeaccessibility/debian/source/options
diff --git a/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install b/ubuntu/_base/tdeaccessibility/debian/tde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install
+++ b/ubuntu/_base/tdeaccessibility/debian/tde-icons-mono-trinity.install
diff --git a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag b/ubuntu/_base/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag
index 6e09eddcf..6e09eddcf 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag
+++ b/ubuntu/_base/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmag
diff --git a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool b/ubuntu/_base/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool
index 91d14cd2a..91d14cd2a 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool
+++ b/ubuntu/_base/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmousetool
diff --git a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth b/ubuntu/_base/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth
index 9b96ff559..9b96ff559 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth
+++ b/ubuntu/_base/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kmouth
diff --git a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd b/ubuntu/_base/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd
index 6b8d94f7a..6b8d94f7a 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd
+++ b/ubuntu/_base/tdeaccessibility/debian/tdeaccessibility-doc-html.doc-base.kttsd
diff --git a/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 4ce41232d..4ce41232d 100644
--- a/ubuntu/maverick/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.docs b/ubuntu/_base/tdeaddons/debian/atlantikdesigner-trinity.docs
index c83224ab3..c83224ab3 100644
--- a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.docs
+++ b/ubuntu/_base/tdeaddons/debian/atlantikdesigner-trinity.docs
diff --git a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.install b/ubuntu/_base/tdeaddons/debian/atlantikdesigner-trinity.install
index aff5ed18a..aff5ed18a 100644
--- a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/atlantikdesigner-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.manpages b/ubuntu/_base/tdeaddons/debian/atlantikdesigner-trinity.manpages
index f0b5385f4..f0b5385f4 100644
--- a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.manpages
+++ b/ubuntu/_base/tdeaddons/debian/atlantikdesigner-trinity.manpages
diff --git a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu b/ubuntu/_base/tdeaddons/debian/atlantikdesigner-trinity.menu
index c195b5843..c195b5843 100644
--- a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/ubuntu/_base/tdeaddons/debian/atlantikdesigner-trinity.menu
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdeaddons/debian/cdbs/debian-qt-kde.mk
index 14dce59aa..14dce59aa 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdeaddons/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk b/ubuntu/_base/tdeaddons/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdeaddons/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/versions.pl b/ubuntu/_base/tdeaddons/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdeaddons/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdeaddons/debian/changelog b/ubuntu/_base/tdeaddons/debian/changelog
index 582fd2fc4..582fd2fc4 100644
--- a/ubuntu/maverick/tdeaddons/debian/changelog
+++ b/ubuntu/_base/tdeaddons/debian/changelog
diff --git a/ubuntu/maverick/tdeaddons/debian/compat b/ubuntu/_base/tdeaddons/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdeaddons/debian/compat
+++ b/ubuntu/_base/tdeaddons/debian/compat
diff --git a/ubuntu/maverick/tdeaddons/debian/control b/ubuntu/_base/tdeaddons/debian/control
index 26f864593..26f864593 100644
--- a/ubuntu/maverick/tdeaddons/debian/control
+++ b/ubuntu/_base/tdeaddons/debian/control
diff --git a/ubuntu/maverick/tdeaddons/debian/copyright b/ubuntu/_base/tdeaddons/debian/copyright
index f954fd3dc..f954fd3dc 100644
--- a/ubuntu/maverick/tdeaddons/debian/copyright
+++ b/ubuntu/_base/tdeaddons/debian/copyright
diff --git a/ubuntu/maverick/tdeaddons/debian/icons/atlantikdesigner.xpm b/ubuntu/_base/tdeaddons/debian/icons/atlantikdesigner.xpm
index 6375271fe..6375271fe 100644
--- a/ubuntu/maverick/tdeaddons/debian/icons/atlantikdesigner.xpm
+++ b/ubuntu/_base/tdeaddons/debian/icons/atlantikdesigner.xpm
diff --git a/ubuntu/maverick/tdeaddons/debian/icons/fsview.xpm b/ubuntu/_base/tdeaddons/debian/icons/fsview.xpm
index b50ac952c..b50ac952c 100644
--- a/ubuntu/maverick/tdeaddons/debian/icons/fsview.xpm
+++ b/ubuntu/_base/tdeaddons/debian/icons/fsview.xpm
diff --git a/ubuntu/maverick/tdeaddons/debian/icons/ksig.xpm b/ubuntu/_base/tdeaddons/debian/icons/ksig.xpm
index 805e027d1..805e027d1 100644
--- a/ubuntu/maverick/tdeaddons/debian/icons/ksig.xpm
+++ b/ubuntu/_base/tdeaddons/debian/icons/ksig.xpm
diff --git a/ubuntu/maverick/tdeaddons/debian/kaddressbook-plugins-trinity.install b/ubuntu/_base/tdeaddons/debian/kaddressbook-plugins-trinity.install
index a2102d3a8..a2102d3a8 100644
--- a/ubuntu/maverick/tdeaddons/debian/kaddressbook-plugins-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/kaddressbook-plugins-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian b/ubuntu/_base/tdeaddons/debian/kate-plugins-trinity.README.Debian
index abbab0eb6..abbab0eb6 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.README.Debian
+++ b/ubuntu/_base/tdeaddons/debian/kate-plugins-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.docs b/ubuntu/_base/tdeaddons/debian/kate-plugins-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.docs
+++ b/ubuntu/_base/tdeaddons/debian/kate-plugins-trinity.docs
diff --git a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.install b/ubuntu/_base/tdeaddons/debian/kate-plugins-trinity.install
index 62c2c47a2..62c2c47a2 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/kate-plugins-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.lintian b/ubuntu/_base/tdeaddons/debian/kate-plugins-trinity.lintian
index 27eca0292..27eca0292 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.lintian
+++ b/ubuntu/_base/tdeaddons/debian/kate-plugins-trinity.lintian
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian b/ubuntu/_base/tdeaddons/debian/kicker-applets-trinity.README.Debian
index 931518168..931518168 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.README.Debian
+++ b/ubuntu/_base/tdeaddons/debian/kicker-applets-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.docs b/ubuntu/_base/tdeaddons/debian/kicker-applets-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.docs
+++ b/ubuntu/_base/tdeaddons/debian/kicker-applets-trinity.docs
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install b/ubuntu/_base/tdeaddons/debian/kicker-applets-trinity.install
index 2ab92dddd..2ab92dddd 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/kicker-applets-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/_base/tdeaddons/debian/kicker-applets-trinity.lintian
index 705d74139..705d74139 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian
+++ b/ubuntu/_base/tdeaddons/debian/kicker-applets-trinity.lintian
diff --git a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.README.Debian b/ubuntu/_base/tdeaddons/debian/knewsticker-scripts-trinity.README.Debian
index f426321b6..f426321b6 100644
--- a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.README.Debian
+++ b/ubuntu/_base/tdeaddons/debian/knewsticker-scripts-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.docs b/ubuntu/_base/tdeaddons/debian/knewsticker-scripts-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.docs
+++ b/ubuntu/_base/tdeaddons/debian/knewsticker-scripts-trinity.docs
diff --git a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.install b/ubuntu/_base/tdeaddons/debian/knewsticker-scripts-trinity.install
index ce04dabc0..ce04dabc0 100644
--- a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/knewsticker-scripts-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.links b/ubuntu/_base/tdeaddons/debian/knewsticker-scripts-trinity.links
index d7b05a420..d7b05a420 100644
--- a/ubuntu/maverick/tdeaddons/debian/knewsticker-scripts-trinity.links
+++ b/ubuntu/_base/tdeaddons/debian/knewsticker-scripts-trinity.links
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.README.Debian
index 255e595ed..255e595ed 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.README.Debian
+++ b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.docs b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.docs
index 2cddc21a6..2cddc21a6 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.docs
+++ b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.docs
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.install
index 22bc62c71..22bc62c71 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.manpages b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.manpages
index b33b9ee5a..b33b9ee5a 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.manpages
+++ b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.manpages
diff --git a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.menu b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.menu
index 743016541..743016541 100644
--- a/ubuntu/maverick/tdeaddons/debian/konq-plugins-trinity.menu
+++ b/ubuntu/_base/tdeaddons/debian/konq-plugins-trinity.menu
diff --git a/ubuntu/maverick/tdeaddons/debian/kontact-plugins-trinity.install b/ubuntu/_base/tdeaddons/debian/kontact-plugins-trinity.install
index 3571c1d1d..3571c1d1d 100644
--- a/ubuntu/maverick/tdeaddons/debian/kontact-plugins-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/kontact-plugins-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.README.Debian b/ubuntu/_base/tdeaddons/debian/ksig-trinity.README.Debian
index 0d97c94db..0d97c94db 100644
--- a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.README.Debian
+++ b/ubuntu/_base/tdeaddons/debian/ksig-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.install b/ubuntu/_base/tdeaddons/debian/ksig-trinity.install
index 10959a93a..10959a93a 100644
--- a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/ksig-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.manpages b/ubuntu/_base/tdeaddons/debian/ksig-trinity.manpages
index 2b3ef735d..2b3ef735d 100644
--- a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.manpages
+++ b/ubuntu/_base/tdeaddons/debian/ksig-trinity.manpages
diff --git a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.menu b/ubuntu/_base/tdeaddons/debian/ksig-trinity.menu
index 84513c2d0..84513c2d0 100644
--- a/ubuntu/maverick/tdeaddons/debian/ksig-trinity.menu
+++ b/ubuntu/_base/tdeaddons/debian/ksig-trinity.menu
diff --git a/ubuntu/maverick/tdeaddons/debian/man/atlantikdesigner-trinity.1 b/ubuntu/_base/tdeaddons/debian/man/atlantikdesigner-trinity.1
index 41a1aeb2b..41a1aeb2b 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/atlantikdesigner-trinity.1
+++ b/ubuntu/_base/tdeaddons/debian/man/atlantikdesigner-trinity.1
diff --git a/ubuntu/maverick/tdeaddons/debian/man/exif-trinity.py.1 b/ubuntu/_base/tdeaddons/debian/man/exif-trinity.py.1
index 73179046f..73179046f 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/exif-trinity.py.1
+++ b/ubuntu/_base/tdeaddons/debian/man/exif-trinity.py.1
diff --git a/ubuntu/maverick/tdeaddons/debian/man/fsview-trinity.1 b/ubuntu/_base/tdeaddons/debian/man/fsview-trinity.1
index a1dd43b20..a1dd43b20 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/fsview-trinity.1
+++ b/ubuntu/_base/tdeaddons/debian/man/fsview-trinity.1
diff --git a/ubuntu/maverick/tdeaddons/debian/man/jpegorient-trinity.1 b/ubuntu/_base/tdeaddons/debian/man/jpegorient-trinity.1
index 3317c868c..3317c868c 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/jpegorient-trinity.1
+++ b/ubuntu/_base/tdeaddons/debian/man/jpegorient-trinity.1
diff --git a/ubuntu/maverick/tdeaddons/debian/man/ksig-trinity.1 b/ubuntu/_base/tdeaddons/debian/man/ksig-trinity.1
index 5c0ec94b5..5c0ec94b5 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/ksig-trinity.1
+++ b/ubuntu/_base/tdeaddons/debian/man/ksig-trinity.1
diff --git a/ubuntu/maverick/tdeaddons/debian/man/lnkforward-trinity.1 b/ubuntu/_base/tdeaddons/debian/man/lnkforward-trinity.1
index 692d6182a..692d6182a 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/lnkforward-trinity.1
+++ b/ubuntu/_base/tdeaddons/debian/man/lnkforward-trinity.1
diff --git a/ubuntu/maverick/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1 b/ubuntu/_base/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
index fe860f1f8..fe860f1f8 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
+++ b/ubuntu/_base/tdeaddons/debian/man/noatunsynaescope-trinity.bin.1
diff --git a/ubuntu/maverick/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1 b/ubuntu/_base/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
index b33eb3b16..b33eb3b16 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
+++ b/ubuntu/_base/tdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
diff --git a/ubuntu/maverick/tdeaddons/debian/man/noatuntyler-trinity.bin.1 b/ubuntu/_base/tdeaddons/debian/man/noatuntyler-trinity.bin.1
index 5a4001047..5a4001047 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/noatuntyler-trinity.bin.1
+++ b/ubuntu/_base/tdeaddons/debian/man/noatuntyler-trinity.bin.1
diff --git a/ubuntu/maverick/tdeaddons/debian/man/orient-trinity.py.1 b/ubuntu/_base/tdeaddons/debian/man/orient-trinity.py.1
index 024ec11d7..024ec11d7 100644
--- a/ubuntu/maverick/tdeaddons/debian/man/orient-trinity.py.1
+++ b/ubuntu/_base/tdeaddons/debian/man/orient-trinity.py.1
diff --git a/ubuntu/maverick/tdeaddons/debian/noatun-plugins-trinity.docs b/ubuntu/_base/tdeaddons/debian/noatun-plugins-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/tdeaddons/debian/noatun-plugins-trinity.docs
+++ b/ubuntu/_base/tdeaddons/debian/noatun-plugins-trinity.docs
diff --git a/ubuntu/maverick/tdeaddons/debian/noatun-plugins-trinity.install b/ubuntu/_base/tdeaddons/debian/noatun-plugins-trinity.install
index 843bdf15c..843bdf15c 100644
--- a/ubuntu/maverick/tdeaddons/debian/noatun-plugins-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/noatun-plugins-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/noatun-plugins-trinity.manpages b/ubuntu/_base/tdeaddons/debian/noatun-plugins-trinity.manpages
index 76a3fc35b..76a3fc35b 100644
--- a/ubuntu/maverick/tdeaddons/debian/noatun-plugins-trinity.manpages
+++ b/ubuntu/_base/tdeaddons/debian/noatun-plugins-trinity.manpages
diff --git a/ubuntu/maverick/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdeaddons/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdeaddons/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdeaddons/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdeaddons/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdeaddons/debian/patches/series b/ubuntu/_base/tdeaddons/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdeaddons/debian/patches/series
+++ b/ubuntu/_base/tdeaddons/debian/patches/series
diff --git a/ubuntu/maverick/tdeaddons/debian/rules b/ubuntu/_base/tdeaddons/debian/rules
index ab0ac0236..ab0ac0236 100755
--- a/ubuntu/maverick/tdeaddons/debian/rules
+++ b/ubuntu/_base/tdeaddons/debian/rules
diff --git a/ubuntu/maverick/tdeaddons/debian/source.lintian-overrides b/ubuntu/_base/tdeaddons/debian/source.lintian-overrides
index 842c39ad3..842c39ad3 100644
--- a/ubuntu/maverick/tdeaddons/debian/source.lintian-overrides
+++ b/ubuntu/_base/tdeaddons/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/tdeaddons/debian/source/format b/ubuntu/_base/tdeaddons/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdeaddons/debian/source/format
+++ b/ubuntu/_base/tdeaddons/debian/source/format
diff --git a/ubuntu/maverick/tdeaddons/debian/source/options b/ubuntu/_base/tdeaddons/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdeaddons/debian/source/options
+++ b/ubuntu/_base/tdeaddons/debian/source/options
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins b/ubuntu/_base/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
index 8bc014f43..8bc014f43 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
+++ b/ubuntu/_base/tdeaddons/debian/tdeaddons-doc-html.doc-base.kate-plugins
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets b/ubuntu/_base/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
index 0ea037e4e..0ea037e4e 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
+++ b/ubuntu/_base/tdeaddons/debian/tdeaddons-doc-html.doc-base.kicker-applets
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins b/ubuntu/_base/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
index 784c55f67..784c55f67 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
+++ b/ubuntu/_base/tdeaddons/debian/tdeaddons-doc-html.doc-base.konq-plugins
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install b/ubuntu/_base/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
index 70f735948..70f735948 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages b/ubuntu/_base/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
index eda9949fb..eda9949fb 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
+++ b/ubuntu/_base/tdeaddons/debian/tdeaddons-tdefile-plugins-trinity.manpages
diff --git a/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian b/ubuntu/_base/tdeaddons/debian/tdeaddons-trinity.README.Debian
index 7a9c3cc03..7a9c3cc03 100644
--- a/ubuntu/maverick/tdeaddons/debian/tdeaddons-trinity.README.Debian
+++ b/ubuntu/_base/tdeaddons/debian/tdeaddons-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdeadmin/debian/cdbs/debian-qt-kde.mk
index 14dce59aa..14dce59aa 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdeadmin/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk b/ubuntu/_base/tdeadmin/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdeadmin/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/versions.pl b/ubuntu/_base/tdeadmin/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdeadmin/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdeadmin/debian/changelog b/ubuntu/_base/tdeadmin/debian/changelog
index 7e212fcb4..7e212fcb4 100644
--- a/ubuntu/maverick/tdeadmin/debian/changelog
+++ b/ubuntu/_base/tdeadmin/debian/changelog
diff --git a/ubuntu/maverick/tdeadmin/debian/compat b/ubuntu/_base/tdeadmin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdeadmin/debian/compat
+++ b/ubuntu/_base/tdeadmin/debian/compat
diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/_base/tdeadmin/debian/control
index 161d16f7f..161d16f7f 100644
--- a/ubuntu/maverick/tdeadmin/debian/control
+++ b/ubuntu/_base/tdeadmin/debian/control
diff --git a/ubuntu/maverick/tdeadmin/debian/copyright b/ubuntu/_base/tdeadmin/debian/copyright
index 7d7dfaf18..7d7dfaf18 100644
--- a/ubuntu/maverick/tdeadmin/debian/copyright
+++ b/ubuntu/_base/tdeadmin/debian/copyright
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/kcron-16.xpm b/ubuntu/_base/tdeadmin/debian/icons/kcron-16.xpm
index bfc8199a0..bfc8199a0 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/kcron-16.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/kcron-16.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/kcron.xpm b/ubuntu/_base/tdeadmin/debian/icons/kcron.xpm
index cbc8bef00..cbc8bef00 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/kcron.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/kcron.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/kdat-16.xpm b/ubuntu/_base/tdeadmin/debian/icons/kdat-16.xpm
index 03099b5f4..03099b5f4 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/kdat-16.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/kdat-16.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/kdat.xpm b/ubuntu/_base/tdeadmin/debian/icons/kdat.xpm
index af560d190..af560d190 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/kdat.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/kdat.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/kpackage-16.xpm b/ubuntu/_base/tdeadmin/debian/icons/kpackage-16.xpm
index 7e402e6fb..7e402e6fb 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/kpackage-16.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/kpackage-16.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/kpackage.xpm b/ubuntu/_base/tdeadmin/debian/icons/kpackage.xpm
index f18eb1f59..f18eb1f59 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/kpackage.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/kpackage.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/ksysv-16.xpm b/ubuntu/_base/tdeadmin/debian/icons/ksysv-16.xpm
index 3a50bc941..3a50bc941 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/ksysv-16.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/ksysv-16.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/ksysv.xpm b/ubuntu/_base/tdeadmin/debian/icons/ksysv.xpm
index ed55cf101..ed55cf101 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/ksysv.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/ksysv.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/kuser-16.xpm b/ubuntu/_base/tdeadmin/debian/icons/kuser-16.xpm
index 8bace5a27..8bace5a27 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/kuser-16.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/kuser-16.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/icons/kuser.xpm b/ubuntu/_base/tdeadmin/debian/icons/kuser.xpm
index bdb97c27b..bdb97c27b 100644
--- a/ubuntu/maverick/tdeadmin/debian/icons/kuser.xpm
+++ b/ubuntu/_base/tdeadmin/debian/icons/kuser.xpm
diff --git a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.install b/ubuntu/_base/tdeadmin/debian/kcron-trinity.install
index 30f478b3a..30f478b3a 100644
--- a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.install
+++ b/ubuntu/_base/tdeadmin/debian/kcron-trinity.install
diff --git a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.manpages b/ubuntu/_base/tdeadmin/debian/kcron-trinity.manpages
index 069c663ae..069c663ae 100644
--- a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.manpages
+++ b/ubuntu/_base/tdeadmin/debian/kcron-trinity.manpages
diff --git a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu b/ubuntu/_base/tdeadmin/debian/kcron-trinity.menu
index 4bd82cc3d..4bd82cc3d 100644
--- a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu
+++ b/ubuntu/_base/tdeadmin/debian/kcron-trinity.menu
diff --git a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.install b/ubuntu/_base/tdeadmin/debian/kdat-trinity.install
index fc9d79002..fc9d79002 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.install
+++ b/ubuntu/_base/tdeadmin/debian/kdat-trinity.install
diff --git a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.manpages b/ubuntu/_base/tdeadmin/debian/kdat-trinity.manpages
index 593a2a25c..593a2a25c 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.manpages
+++ b/ubuntu/_base/tdeadmin/debian/kdat-trinity.manpages
diff --git a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu b/ubuntu/_base/tdeadmin/debian/kdat-trinity.menu
index 0970faaf2..0970faaf2 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu
+++ b/ubuntu/_base/tdeadmin/debian/kdat-trinity.menu
diff --git a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.install b/ubuntu/_base/tdeadmin/debian/knetworkconf-trinity.install
index ec0333100..ec0333100 100644
--- a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.install
+++ b/ubuntu/_base/tdeadmin/debian/knetworkconf-trinity.install
diff --git a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst b/ubuntu/_base/tdeadmin/debian/knetworkconf-trinity.postinst
index 94012bd76..94012bd76 100644
--- a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst
+++ b/ubuntu/_base/tdeadmin/debian/knetworkconf-trinity.postinst
diff --git a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.install b/ubuntu/_base/tdeadmin/debian/kpackage-trinity.install
index 0aac54e24..0aac54e24 100644
--- a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.install
+++ b/ubuntu/_base/tdeadmin/debian/kpackage-trinity.install
diff --git a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.manpages b/ubuntu/_base/tdeadmin/debian/kpackage-trinity.manpages
index ef024d1b2..ef024d1b2 100644
--- a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.manpages
+++ b/ubuntu/_base/tdeadmin/debian/kpackage-trinity.manpages
diff --git a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu b/ubuntu/_base/tdeadmin/debian/kpackage-trinity.menu
index c1a3762b0..c1a3762b0 100644
--- a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu
+++ b/ubuntu/_base/tdeadmin/debian/kpackage-trinity.menu
diff --git a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.mime b/ubuntu/_base/tdeadmin/debian/kpackage-trinity.mime
index e416e75bd..e416e75bd 100644
--- a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.mime
+++ b/ubuntu/_base/tdeadmin/debian/kpackage-trinity.mime
diff --git a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.install b/ubuntu/_base/tdeadmin/debian/ksysv-trinity.install
index 2437f6aa0..2437f6aa0 100644
--- a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.install
+++ b/ubuntu/_base/tdeadmin/debian/ksysv-trinity.install
diff --git a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.manpages b/ubuntu/_base/tdeadmin/debian/ksysv-trinity.manpages
index eac192172..eac192172 100644
--- a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.manpages
+++ b/ubuntu/_base/tdeadmin/debian/ksysv-trinity.manpages
diff --git a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu b/ubuntu/_base/tdeadmin/debian/ksysv-trinity.menu
index f28aef7bc..f28aef7bc 100644
--- a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu
+++ b/ubuntu/_base/tdeadmin/debian/ksysv-trinity.menu
diff --git a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.install b/ubuntu/_base/tdeadmin/debian/kuser-trinity.install
index 24f6c245d..24f6c245d 100644
--- a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.install
+++ b/ubuntu/_base/tdeadmin/debian/kuser-trinity.install
diff --git a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.manpages b/ubuntu/_base/tdeadmin/debian/kuser-trinity.manpages
index 917414a2d..917414a2d 100644
--- a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.manpages
+++ b/ubuntu/_base/tdeadmin/debian/kuser-trinity.manpages
diff --git a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu b/ubuntu/_base/tdeadmin/debian/kuser-trinity.menu
index 5280c0a09..5280c0a09 100644
--- a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu
+++ b/ubuntu/_base/tdeadmin/debian/kuser-trinity.menu
diff --git a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.install b/ubuntu/_base/tdeadmin/debian/lilo-config-trinity.install
index a30ed1fe7..a30ed1fe7 100644
--- a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.install
+++ b/ubuntu/_base/tdeadmin/debian/lilo-config-trinity.install
diff --git a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian b/ubuntu/_base/tdeadmin/debian/lilo-config-trinity.lintian
index f268b6b2a..f268b6b2a 100644
--- a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/ubuntu/_base/tdeadmin/debian/lilo-config-trinity.lintian
diff --git a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu b/ubuntu/_base/tdeadmin/debian/lilo-config-trinity.menu
index 77a15d4a9..77a15d4a9 100644
--- a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.menu
+++ b/ubuntu/_base/tdeadmin/debian/lilo-config-trinity.menu
diff --git a/ubuntu/maverick/tdeadmin/debian/man/kcron-trinity.sgml b/ubuntu/_base/tdeadmin/debian/man/kcron-trinity.sgml
index f07379504..f07379504 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/kcron-trinity.sgml
+++ b/ubuntu/_base/tdeadmin/debian/man/kcron-trinity.sgml
diff --git a/ubuntu/maverick/tdeadmin/debian/man/kdat-trinity.sgml b/ubuntu/_base/tdeadmin/debian/man/kdat-trinity.sgml
index 0eebc4a91..0eebc4a91 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/kdat-trinity.sgml
+++ b/ubuntu/_base/tdeadmin/debian/man/kdat-trinity.sgml
diff --git a/ubuntu/maverick/tdeadmin/debian/man/kpackage-trinity.sgml b/ubuntu/_base/tdeadmin/debian/man/kpackage-trinity.sgml
index e8dac316d..e8dac316d 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/kpackage-trinity.sgml
+++ b/ubuntu/_base/tdeadmin/debian/man/kpackage-trinity.sgml
diff --git a/ubuntu/maverick/tdeadmin/debian/man/ksysv-trinity.sgml b/ubuntu/_base/tdeadmin/debian/man/ksysv-trinity.sgml
index 059a0010d..059a0010d 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/ksysv-trinity.sgml
+++ b/ubuntu/_base/tdeadmin/debian/man/ksysv-trinity.sgml
diff --git a/ubuntu/maverick/tdeadmin/debian/man/kuser-trinity.sgml b/ubuntu/_base/tdeadmin/debian/man/kuser-trinity.sgml
index e99ddba47..e99ddba47 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/kuser-trinity.sgml
+++ b/ubuntu/_base/tdeadmin/debian/man/kuser-trinity.sgml
diff --git a/ubuntu/maverick/tdeadmin/debian/man/secpolicy-trinity.sgml b/ubuntu/_base/tdeadmin/debian/man/secpolicy-trinity.sgml
index af7be9b7f..af7be9b7f 100644
--- a/ubuntu/maverick/tdeadmin/debian/man/secpolicy-trinity.sgml
+++ b/ubuntu/_base/tdeadmin/debian/man/secpolicy-trinity.sgml
diff --git a/ubuntu/maverick/tdeadmin/debian/not-installed.list b/ubuntu/_base/tdeadmin/debian/not-installed.list
index 22bedffe4..22bedffe4 100644
--- a/ubuntu/maverick/tdeadmin/debian/not-installed.list
+++ b/ubuntu/_base/tdeadmin/debian/not-installed.list
diff --git a/ubuntu/maverick/tdeadmin/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdeadmin/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdeadmin/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdeadmin/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdeadmin/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdeadmin/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdeadmin/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdeadmin/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdeadmin/debian/patches/series b/ubuntu/_base/tdeadmin/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdeadmin/debian/patches/series
+++ b/ubuntu/_base/tdeadmin/debian/patches/series
diff --git a/ubuntu/maverick/tdeadmin/debian/rules b/ubuntu/_base/tdeadmin/debian/rules
index cb9b120fc..cb9b120fc 100755
--- a/ubuntu/maverick/tdeadmin/debian/rules
+++ b/ubuntu/_base/tdeadmin/debian/rules
diff --git a/ubuntu/maverick/tdeadmin/debian/source/format b/ubuntu/_base/tdeadmin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdeadmin/debian/source/format
+++ b/ubuntu/_base/tdeadmin/debian/source/format
diff --git a/ubuntu/maverick/tdeadmin/debian/source/options b/ubuntu/_base/tdeadmin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdeadmin/debian/source/options
+++ b/ubuntu/_base/tdeadmin/debian/source/options
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
index 2dec1c5ee..2dec1c5ee 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
+++ b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.kcron
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
index 52c649f74..52c649f74 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
+++ b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.kdat
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
index 134b08805..134b08805 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
+++ b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.knetworkconf
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
index eb3b6bde6..eb3b6bde6 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
+++ b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.kpackage
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
index 1ea25aea5..1ea25aea5 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
+++ b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.ksysv
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
index 94edc894f..94edc894f 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
+++ b/ubuntu/_base/tdeadmin/debian/tdeadmin-doc-html.doc-base.kuser
diff --git a/ubuntu/maverick/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install b/ubuntu/_base/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install
index 0e6977ee8..0e6977ee8 100644
--- a/ubuntu/maverick/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/tdeadmin/debian/tdeadmin-tdefile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 7d7396e71..7d7396e71 100644
--- a/ubuntu/maverick/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdeartwork/debian/cdbs/debian-qt-kde.mk
index f2cffb3c2..f2cffb3c2 100644
--- a/ubuntu/maverick/tdeartwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdeartwork/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk b/ubuntu/_base/tdeartwork/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdeartwork/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdeartwork/debian/cdbs/versions.pl b/ubuntu/_base/tdeartwork/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdeartwork/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdeartwork/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdeartwork/debian/changelog b/ubuntu/_base/tdeartwork/debian/changelog
index 27f24b749..27f24b749 100644
--- a/ubuntu/maverick/tdeartwork/debian/changelog
+++ b/ubuntu/_base/tdeartwork/debian/changelog
diff --git a/ubuntu/maverick/tdeartwork/debian/compat b/ubuntu/_base/tdeartwork/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdeartwork/debian/compat
+++ b/ubuntu/_base/tdeartwork/debian/compat
diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/_base/tdeartwork/debian/control
index 75034669c..75034669c 100644
--- a/ubuntu/maverick/tdeartwork/debian/control
+++ b/ubuntu/_base/tdeartwork/debian/control
diff --git a/ubuntu/maverick/tdeartwork/debian/copyright b/ubuntu/_base/tdeartwork/debian/copyright
index dbdd37868..dbdd37868 100644
--- a/ubuntu/maverick/tdeartwork/debian/copyright
+++ b/ubuntu/_base/tdeartwork/debian/copyright
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kbanner-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kbanner-trinity.kss.1
index d8cc7f4f6..d8cc7f4f6 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kbanner-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kbanner-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kblob-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kblob-trinity.kss.1
index d3d2b9394..d3d2b9394 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kblob-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kblob-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kclock-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kclock-trinity.kss.1
index 03c795709..03c795709 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kclock-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kclock-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/keuphoria-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/keuphoria-trinity.kss.1
index c8fb549b8..c8fb549b8 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/keuphoria-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/keuphoria-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kfiresaver-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kfiresaver-trinity.kss.1
index 58f427ba4..58f427ba4 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kfiresaver-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kfiresaver-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kflux-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kflux-trinity.kss.1
index 3556a7bc3..3556a7bc3 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kflux-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kflux-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kfountain-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kfountain-trinity.kss.1
index 9aa452ded..9aa452ded 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kfountain-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kfountain-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kgravity-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kgravity-trinity.kss.1
index f7789052b..f7789052b 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kgravity-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kgravity-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/klines-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/klines-trinity.kss.1
index 6121f8e2d..6121f8e2d 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/klines-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/klines-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/klorenz-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/klorenz-trinity.kss.1
index 3df447a64..3df447a64 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/klorenz-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/klorenz-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kpendulum-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kpendulum-trinity.kss.1
index d253f4189..d253f4189 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kpendulum-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kpendulum-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kpolygon-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kpolygon-trinity.kss.1
index bc7e56868..bc7e56868 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kpolygon-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kpolygon-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/krotation-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/krotation-trinity.kss.1
index 6bc0c172b..6bc0c172b 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/krotation-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/krotation-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kscience-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kscience-trinity.kss.1
index 061374a15..061374a15 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kscience-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kscience-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kslideshow-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kslideshow-trinity.kss.1
index c8b208e0d..c8b208e0d 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kslideshow-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kslideshow-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/ksolarwinds-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
index 8555d6209..8555d6209 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/ksolarwinds-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kspace-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kspace-trinity.kss.1
index 1e39ff18e..1e39ff18e 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kspace-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kspace-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kswarm-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kswarm-trinity.kss.1
index ea1e0d653..ea1e0d653 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kswarm-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kswarm-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kvm-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kvm-trinity.kss.1
index a7e037cbe..a7e037cbe 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kvm-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kvm-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kwave-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/kwave-trinity.kss.1
index 8ad59b9c1..8ad59b9c1 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kwave-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kwave-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kxsconfig-trinity.1 b/ubuntu/_base/tdeartwork/debian/man/kxsconfig-trinity.1
index f4cd67694..f4cd67694 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kxsconfig-trinity.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kxsconfig-trinity.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/kxsrun-trinity.1 b/ubuntu/_base/tdeartwork/debian/man/kxsrun-trinity.1
index 9e45a775c..9e45a775c 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/kxsrun-trinity.1
+++ b/ubuntu/_base/tdeartwork/debian/man/kxsrun-trinity.1
diff --git a/ubuntu/maverick/tdeartwork/debian/man/tdepartsaver-trinity.kss.1 b/ubuntu/_base/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
index 00b4d4c58..00b4d4c58 100644
--- a/ubuntu/maverick/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
+++ b/ubuntu/_base/tdeartwork/debian/man/tdepartsaver-trinity.kss.1
diff --git a/ubuntu/maverick/tdeartwork/debian/patches/series b/ubuntu/_base/tdeartwork/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/tdeartwork/debian/patches/series
+++ b/ubuntu/_base/tdeartwork/debian/patches/series
diff --git a/ubuntu/maverick/tdeartwork/debian/rules b/ubuntu/_base/tdeartwork/debian/rules
index 12bb5fc27..12bb5fc27 100755
--- a/ubuntu/maverick/tdeartwork/debian/rules
+++ b/ubuntu/_base/tdeartwork/debian/rules
diff --git a/ubuntu/maverick/tdeartwork/debian/source/format b/ubuntu/_base/tdeartwork/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdeartwork/debian/source/format
+++ b/ubuntu/_base/tdeartwork/debian/source/format
diff --git a/ubuntu/maverick/tdeartwork/debian/source/options b/ubuntu/_base/tdeartwork/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdeartwork/debian/source/options
+++ b/ubuntu/_base/tdeartwork/debian/source/options
diff --git a/ubuntu/maverick/tdeartwork/debian/tdeartwork-emoticons-trinity.install b/ubuntu/_base/tdeartwork/debian/tdeartwork-emoticons-trinity.install
index 0fea42334..0fea42334 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdeartwork-emoticons-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdeartwork-emoticons-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/tdeartwork-misc-trinity.install b/ubuntu/_base/tdeartwork/debian/tdeartwork-misc-trinity.install
index 0285201e7..0285201e7 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdeartwork-misc-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdeartwork-misc-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install b/ubuntu/_base/tdeartwork/debian/tdeartwork-style-trinity.install
index c62e326fe..c62e326fe 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdeartwork-style-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-icon-trinity.install b/ubuntu/_base/tdeartwork/debian/tdeartwork-theme-icon-trinity.install
index 8a1dc19a0..8a1dc19a0 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-icon-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdeartwork-theme-icon-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install b/ubuntu/_base/tdeartwork/debian/tdeartwork-theme-window-trinity.install
index b36062a5c..b36062a5c 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdeartwork-theme-window-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdeartwork-theme-window-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/tdeartwork.README.Debian b/ubuntu/_base/tdeartwork/debian/tdeartwork.README.Debian
index 7094b276f..7094b276f 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdeartwork.README.Debian
+++ b/ubuntu/_base/tdeartwork/debian/tdeartwork.README.Debian
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.install b/ubuntu/_base/tdeartwork/debian/tdescreensaver-trinity.install
index 012466480..012466480 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdescreensaver-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.manpages b/ubuntu/_base/tdeartwork/debian/tdescreensaver-trinity.manpages
index 294e72dd8..294e72dd8 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-trinity.manpages
+++ b/ubuntu/_base/tdeartwork/debian/tdescreensaver-trinity.manpages
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
index 3f7f191ef..3f7f191ef 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.install b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
index 2657a6d03..2657a6d03 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
index 356af4f32..356af4f32 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
+++ b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-trinity.manpages
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
index e6b5fb014..e6b5fb014 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian
index d0f59dc34..d0f59dc34 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian
+++ b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers-webcollage.README.Debian
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers.README.Debian b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers.README.Debian
index 11523e4f1..11523e4f1 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers.README.Debian
+++ b/ubuntu/_base/tdeartwork/debian/tdescreensaver-xsavers.README.Debian
diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver.README.Debian b/ubuntu/_base/tdeartwork/debian/tdescreensaver.README.Debian
index 80f614b95..80f614b95 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver.README.Debian
+++ b/ubuntu/_base/tdeartwork/debian/tdescreensaver.README.Debian
diff --git a/ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install b/ubuntu/_base/tdeartwork/debian/tdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install
+++ b/ubuntu/_base/tdeartwork/debian/tdewallpapers-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap b/ubuntu/_base/tdebase/debian/80ubuntu-xmodmap
index fa60a4107..fa60a4107 100644
--- a/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap
+++ b/ubuntu/_base/tdebase/debian/80ubuntu-xmodmap
diff --git a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/_base/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
index f5a54d259..f5a54d259 100644
--- a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/_base/tdebase/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/ubuntu/maverick/tdebase/debian/NEWS b/ubuntu/_base/tdebase/debian/NEWS
index 226d0b1aa..226d0b1aa 100644
--- a/ubuntu/maverick/tdebase/debian/NEWS
+++ b/ubuntu/_base/tdebase/debian/NEWS
diff --git a/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdebase/debian/cdbs/debian-qt-kde.mk
index 3bd77b8f7..3bd77b8f7 100644
--- a/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdebase/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdebase/debian/cdbs/kde.mk b/ubuntu/_base/tdebase/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/tdebase/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdebase/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdebase/debian/cdbs/versions.pl b/ubuntu/_base/tdebase/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdebase/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdebase/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/_base/tdebase/debian/changelog
index cdbe4c14a..cdbe4c14a 100644
--- a/ubuntu/maverick/tdebase/debian/changelog
+++ b/ubuntu/_base/tdebase/debian/changelog
diff --git a/ubuntu/maverick/tdebase/debian/compat b/ubuntu/_base/tdebase/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdebase/debian/compat
+++ b/ubuntu/_base/tdebase/debian/compat
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/_base/tdebase/debian/control
index fc69deacd..fc69deacd 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/_base/tdebase/debian/control
diff --git a/ubuntu/maverick/tdebase/debian/copyright b/ubuntu/_base/tdebase/debian/copyright
index 6c6bc4f78..6c6bc4f78 100644
--- a/ubuntu/maverick/tdebase/debian/copyright
+++ b/ubuntu/_base/tdebase/debian/copyright
diff --git a/ubuntu/maverick/tdebase/debian/icons/kappfinder-16.xpm b/ubuntu/_base/tdebase/debian/icons/kappfinder-16.xpm
index 7190943d7..7190943d7 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kappfinder-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kappfinder-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kappfinder.xpm b/ubuntu/_base/tdebase/debian/icons/kappfinder.xpm
index f5d7c753f..f5d7c753f 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kappfinder.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kappfinder.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kate-16.xpm b/ubuntu/_base/tdebase/debian/icons/kate-16.xpm
index f77128d44..f77128d44 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kate-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kate-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kate.xpm b/ubuntu/_base/tdebase/debian/icons/kate.xpm
index be7d87b81..be7d87b81 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kate.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kate.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kcontrol-16.xpm b/ubuntu/_base/tdebase/debian/icons/kcontrol-16.xpm
index 6597a17c4..6597a17c4 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kcontrol-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kcontrol-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kcontrol.xpm b/ubuntu/_base/tdebase/debian/icons/kcontrol.xpm
index 15acc56d5..15acc56d5 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kcontrol.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kcontrol.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/keditbookmarks-16.xpm b/ubuntu/_base/tdebase/debian/icons/keditbookmarks-16.xpm
index 0006e7f3a..0006e7f3a 100644
--- a/ubuntu/maverick/tdebase/debian/icons/keditbookmarks-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/keditbookmarks-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/keditbookmarks.xpm b/ubuntu/_base/tdebase/debian/icons/keditbookmarks.xpm
index 545b24722..545b24722 100644
--- a/ubuntu/maverick/tdebase/debian/icons/keditbookmarks.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/keditbookmarks.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kfind-16.xpm b/ubuntu/_base/tdebase/debian/icons/kfind-16.xpm
index d00be036e..d00be036e 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kfind-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kfind-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kfind.xpm b/ubuntu/_base/tdebase/debian/icons/kfind.xpm
index 95394fe53..95394fe53 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kfind.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kfind.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kfm-16.xpm b/ubuntu/_base/tdebase/debian/icons/kfm-16.xpm
index 6de4eaf08..6de4eaf08 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kfm-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kfm-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kfm.xpm b/ubuntu/_base/tdebase/debian/icons/kfm.xpm
index 2aa9dd403..2aa9dd403 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kfm.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kfm.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/khelpcenter-16.xpm b/ubuntu/_base/tdebase/debian/icons/khelpcenter-16.xpm
index 666524486..666524486 100644
--- a/ubuntu/maverick/tdebase/debian/icons/khelpcenter-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/khelpcenter-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/khelpcenter.xpm b/ubuntu/_base/tdebase/debian/icons/khelpcenter.xpm
index 3cfbba7bd..3cfbba7bd 100644
--- a/ubuntu/maverick/tdebase/debian/icons/khelpcenter.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/khelpcenter.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kicker.xpm b/ubuntu/_base/tdebase/debian/icons/kicker.xpm
index f5fcce72c..f5fcce72c 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kicker.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kicker.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kjobviewer-16.xpm b/ubuntu/_base/tdebase/debian/icons/kjobviewer-16.xpm
index ed1bcc38f..ed1bcc38f 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kjobviewer-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kjobviewer-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kjobviewer.xpm b/ubuntu/_base/tdebase/debian/icons/kjobviewer.xpm
index 8ad886325..8ad886325 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kjobviewer.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kjobviewer.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/klipper-16.xpm b/ubuntu/_base/tdebase/debian/icons/klipper-16.xpm
index 82115ab2a..82115ab2a 100644
--- a/ubuntu/maverick/tdebase/debian/icons/klipper-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/klipper-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/klipper.xpm b/ubuntu/_base/tdebase/debian/icons/klipper.xpm
index aaafd1d03..aaafd1d03 100644
--- a/ubuntu/maverick/tdebase/debian/icons/klipper.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/klipper.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kmenuedit-16.xpm b/ubuntu/_base/tdebase/debian/icons/kmenuedit-16.xpm
index d7af0faa8..d7af0faa8 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kmenuedit-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kmenuedit-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kmenuedit.xpm b/ubuntu/_base/tdebase/debian/icons/kmenuedit.xpm
index 87297263b..87297263b 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kmenuedit.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kmenuedit.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/konqueror-16.xpm b/ubuntu/_base/tdebase/debian/icons/konqueror-16.xpm
index ece87a112..ece87a112 100644
--- a/ubuntu/maverick/tdebase/debian/icons/konqueror-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/konqueror-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/konqueror.xpm b/ubuntu/_base/tdebase/debian/icons/konqueror.xpm
index 6700a9f44..6700a9f44 100644
--- a/ubuntu/maverick/tdebase/debian/icons/konqueror.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/konqueror.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/konsole-16.xpm b/ubuntu/_base/tdebase/debian/icons/konsole-16.xpm
index 3be52807f..3be52807f 100644
--- a/ubuntu/maverick/tdebase/debian/icons/konsole-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/konsole-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/konsole.xpm b/ubuntu/_base/tdebase/debian/icons/konsole.xpm
index 445cf4409..445cf4409 100644
--- a/ubuntu/maverick/tdebase/debian/icons/konsole.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/konsole.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kpager-16.xpm b/ubuntu/_base/tdebase/debian/icons/kpager-16.xpm
index e9360e56f..e9360e56f 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kpager-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kpager-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kpager.xpm b/ubuntu/_base/tdebase/debian/icons/kpager.xpm
index 71b895ccf..71b895ccf 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kpager.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kpager.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kpersonalizer-16.xpm b/ubuntu/_base/tdebase/debian/icons/kpersonalizer-16.xpm
index fab4574ac..fab4574ac 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kpersonalizer-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kpersonalizer-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kpersonalizer.xpm b/ubuntu/_base/tdebase/debian/icons/kpersonalizer.xpm
index 9f22bca3a..9f22bca3a 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kpersonalizer.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kpersonalizer.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/ksysguard-16.xpm b/ubuntu/_base/tdebase/debian/icons/ksysguard-16.xpm
index 4ca56f859..4ca56f859 100644
--- a/ubuntu/maverick/tdebase/debian/icons/ksysguard-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/ksysguard-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/ksysguard.xpm b/ubuntu/_base/tdebase/debian/icons/ksysguard.xpm
index a4423436a..a4423436a 100644
--- a/ubuntu/maverick/tdebase/debian/icons/ksysguard.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/ksysguard.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/ktip-16.xpm b/ubuntu/_base/tdebase/debian/icons/ktip-16.xpm
index 84b879a0f..84b879a0f 100644
--- a/ubuntu/maverick/tdebase/debian/icons/ktip-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/ktip-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/ktip.xpm b/ubuntu/_base/tdebase/debian/icons/ktip.xpm
index beda416c0..beda416c0 100644
--- a/ubuntu/maverick/tdebase/debian/icons/ktip.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/ktip.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kwrite-16.xpm b/ubuntu/_base/tdebase/debian/icons/kwrite-16.xpm
index 47a6d14c2..47a6d14c2 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kwrite-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kwrite-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kwrite.xpm b/ubuntu/_base/tdebase/debian/icons/kwrite.xpm
index adef05a7c..adef05a7c 100644
--- a/ubuntu/maverick/tdebase/debian/icons/kwrite.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/kwrite.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/tdeprint-16.xpm b/ubuntu/_base/tdebase/debian/icons/tdeprint-16.xpm
index 58b87a90d..58b87a90d 100644
--- a/ubuntu/maverick/tdebase/debian/icons/tdeprint-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/tdeprint-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/tdeprint.xpm b/ubuntu/_base/tdebase/debian/icons/tdeprint.xpm
index c10da523c..c10da523c 100644
--- a/ubuntu/maverick/tdebase/debian/icons/tdeprint.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/tdeprint.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/tdeprintfax-16.xpm b/ubuntu/_base/tdebase/debian/icons/tdeprintfax-16.xpm
index 3e07385e5..3e07385e5 100644
--- a/ubuntu/maverick/tdebase/debian/icons/tdeprintfax-16.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/tdeprintfax-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/tdeprintfax.xpm b/ubuntu/_base/tdebase/debian/icons/tdeprintfax.xpm
index 9f5d6a2e7..9f5d6a2e7 100644
--- a/ubuntu/maverick/tdebase/debian/icons/tdeprintfax.xpm
+++ b/ubuntu/_base/tdebase/debian/icons/tdeprintfax.xpm
diff --git a/ubuntu/maverick/tdebase/debian/img/cr128-app-energy_star.png.uu b/ubuntu/_base/tdebase/debian/img/cr128-app-energy_star.png.uu
index 0d74bb8ef..0d74bb8ef 100644
--- a/ubuntu/maverick/tdebase/debian/img/cr128-app-energy_star.png.uu
+++ b/ubuntu/_base/tdebase/debian/img/cr128-app-energy_star.png.uu
diff --git a/ubuntu/maverick/tdebase/debian/img/cr16-app-energy_star.png.uu b/ubuntu/_base/tdebase/debian/img/cr16-app-energy_star.png.uu
index 174f00947..174f00947 100644
--- a/ubuntu/maverick/tdebase/debian/img/cr16-app-energy_star.png.uu
+++ b/ubuntu/_base/tdebase/debian/img/cr16-app-energy_star.png.uu
diff --git a/ubuntu/maverick/tdebase/debian/img/cr32-app-energy_star.png.uu b/ubuntu/_base/tdebase/debian/img/cr32-app-energy_star.png.uu
index 77c6322f4..77c6322f4 100644
--- a/ubuntu/maverick/tdebase/debian/img/cr32-app-energy_star.png.uu
+++ b/ubuntu/_base/tdebase/debian/img/cr32-app-energy_star.png.uu
diff --git a/ubuntu/maverick/tdebase/debian/img/cr48-app-energy_star.png.uu b/ubuntu/_base/tdebase/debian/img/cr48-app-energy_star.png.uu
index 0be925842..0be925842 100644
--- a/ubuntu/maverick/tdebase/debian/img/cr48-app-energy_star.png.uu
+++ b/ubuntu/_base/tdebase/debian/img/cr48-app-energy_star.png.uu
diff --git a/ubuntu/maverick/tdebase/debian/img/cr64-app-energy_star.png.uu b/ubuntu/_base/tdebase/debian/img/cr64-app-energy_star.png.uu
index 0691c9b78..0691c9b78 100644
--- a/ubuntu/maverick/tdebase/debian/img/cr64-app-energy_star.png.uu
+++ b/ubuntu/_base/tdebase/debian/img/cr64-app-energy_star.png.uu
diff --git a/ubuntu/maverick/tdebase/debian/kappfinder-trinity.install b/ubuntu/_base/tdebase/debian/kappfinder-trinity.install
index d99c8f055..d99c8f055 100644
--- a/ubuntu/maverick/tdebase/debian/kappfinder-trinity.install
+++ b/ubuntu/_base/tdebase/debian/kappfinder-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kappfinder-trinity.manpages b/ubuntu/_base/tdebase/debian/kappfinder-trinity.manpages
index b83ec9565..b83ec9565 100644
--- a/ubuntu/maverick/tdebase/debian/kappfinder-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/kappfinder-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kappfinder-trinity.menu b/ubuntu/_base/tdebase/debian/kappfinder-trinity.menu
index 55a4fde61..55a4fde61 100644
--- a/ubuntu/maverick/tdebase/debian/kappfinder-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/kappfinder-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/kappfinder-trinity.postinst b/ubuntu/_base/tdebase/debian/kappfinder-trinity.postinst
index 24b3e6df3..24b3e6df3 100644
--- a/ubuntu/maverick/tdebase/debian/kappfinder-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/kappfinder-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.install b/ubuntu/_base/tdebase/debian/kate-trinity.install
index 93c4a1b87..93c4a1b87 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.install
+++ b/ubuntu/_base/tdebase/debian/kate-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.lintian b/ubuntu/_base/tdebase/debian/kate-trinity.lintian
index d6a673d2f..d6a673d2f 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/kate-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.manpages b/ubuntu/_base/tdebase/debian/kate-trinity.manpages
index 56b772103..56b772103 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/kate-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.menu b/ubuntu/_base/tdebase/debian/kate-trinity.menu
index a725ecd73..a725ecd73 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/kate-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.mime b/ubuntu/_base/tdebase/debian/kate-trinity.mime
index c148c7556..c148c7556 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.mime
+++ b/ubuntu/_base/tdebase/debian/kate-trinity.mime
diff --git a/ubuntu/maverick/tdebase/debian/kcheckpass-trinity.pam b/ubuntu/_base/tdebase/debian/kcheckpass-trinity.pam
index 91e91979e..91e91979e 100644
--- a/ubuntu/maverick/tdebase/debian/kcheckpass-trinity.pam
+++ b/ubuntu/_base/tdebase/debian/kcheckpass-trinity.pam
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.README.Debian b/ubuntu/_base/tdebase/debian/kcontrol-trinity.README.Debian
index 8c7926ad5..8c7926ad5 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.README.Debian
+++ b/ubuntu/_base/tdebase/debian/kcontrol-trinity.README.Debian
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/_base/tdebase/debian/kcontrol-trinity.install
index ea2012d48..ea2012d48 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/_base/tdebase/debian/kcontrol-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/_base/tdebase/debian/kcontrol-trinity.lintian
index 95c1d8196..95c1d8196 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/kcontrol-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.menu b/ubuntu/_base/tdebase/debian/kcontrol-trinity.menu
index 655f614a8..655f614a8 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/kcontrol-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.postinst b/ubuntu/_base/tdebase/debian/kcontrol-trinity.postinst
index 4733c3a43..4733c3a43 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/kcontrol-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.postrm b/ubuntu/_base/tdebase/debian/kcontrol-trinity.postrm
index 3832d3be4..3832d3be4 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.postrm
+++ b/ubuntu/_base/tdebase/debian/kcontrol-trinity.postrm
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.preinst b/ubuntu/_base/tdebase/debian/kcontrol-trinity.preinst
index 15a39d9f1..15a39d9f1 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.preinst
+++ b/ubuntu/_base/tdebase/debian/kcontrol-trinity.preinst
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install b/ubuntu/_base/tdebase/debian/kdesktop-trinity.install
index af6533f86..af6533f86 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.install
+++ b/ubuntu/_base/tdebase/debian/kdesktop-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian b/ubuntu/_base/tdebase/debian/kdesktop-trinity.lintian
index caf101636..caf101636 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/kdesktop-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.postinst b/ubuntu/_base/tdebase/debian/kdesktop-trinity.postinst
index 0b3eb0b52..0b3eb0b52 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/kdesktop-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.preinst b/ubuntu/_base/tdebase/debian/kdesktop-trinity.preinst
index fab4ef420..fab4ef420 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.preinst
+++ b/ubuntu/_base/tdebase/debian/kdesktop-trinity.preinst
diff --git a/ubuntu/maverick/tdebase/debian/kfind-trinity.install b/ubuntu/_base/tdebase/debian/kfind-trinity.install
index 3c02d8aae..3c02d8aae 100644
--- a/ubuntu/maverick/tdebase/debian/kfind-trinity.install
+++ b/ubuntu/_base/tdebase/debian/kfind-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kfind-trinity.manpages b/ubuntu/_base/tdebase/debian/kfind-trinity.manpages
index f0e6d9c78..f0e6d9c78 100644
--- a/ubuntu/maverick/tdebase/debian/kfind-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/kfind-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kfind-trinity.menu b/ubuntu/_base/tdebase/debian/kfind-trinity.menu
index 099be9070..099be9070 100644
--- a/ubuntu/maverick/tdebase/debian/kfind-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/kfind-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/kfind-trinity.postinst b/ubuntu/_base/tdebase/debian/kfind-trinity.postinst
index 1020c703e..1020c703e 100644
--- a/ubuntu/maverick/tdebase/debian/kfind-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/kfind-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install b/ubuntu/_base/tdebase/debian/khelpcenter-trinity.install
index 97dabfaad..97dabfaad 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/_base/tdebase/debian/khelpcenter-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/_base/tdebase/debian/khelpcenter-trinity.lintian
index 3a278bff7..3a278bff7 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/khelpcenter-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.menu b/ubuntu/_base/tdebase/debian/khelpcenter-trinity.menu
index 1ce08222c..1ce08222c 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/khelpcenter-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.postinst b/ubuntu/_base/tdebase/debian/khelpcenter-trinity.postinst
index b6b0656b7..b6b0656b7 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/khelpcenter-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.install b/ubuntu/_base/tdebase/debian/kicker-trinity.install
index 5133bcb90..5133bcb90 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.install
+++ b/ubuntu/_base/tdebase/debian/kicker-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian b/ubuntu/_base/tdebase/debian/kicker-trinity.lintian
index 9f6cb2e4d..9f6cb2e4d 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/kicker-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.manpages b/ubuntu/_base/tdebase/debian/kicker-trinity.manpages
index 399a3843c..399a3843c 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/kicker-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.menu b/ubuntu/_base/tdebase/debian/kicker-trinity.menu
index 9d27a7e35..9d27a7e35 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/kicker-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.preinst b/ubuntu/_base/tdebase/debian/kicker-trinity.preinst
index 598e46d22..598e46d22 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.preinst
+++ b/ubuntu/_base/tdebase/debian/kicker-trinity.preinst
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.install b/ubuntu/_base/tdebase/debian/klipper-trinity.install
index 719b878c8..719b878c8 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.install
+++ b/ubuntu/_base/tdebase/debian/klipper-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian b/ubuntu/_base/tdebase/debian/klipper-trinity.lintian
index bee8b8020..bee8b8020 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/klipper-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.menu b/ubuntu/_base/tdebase/debian/klipper-trinity.menu
index 42cf5a523..42cf5a523 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/klipper-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.postinst b/ubuntu/_base/tdebase/debian/klipper-trinity.postinst
index b2c57de01..b2c57de01 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/klipper-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.install
index ec5672f01..ec5672f01 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.install
+++ b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.lintian
index c36dd0445..c36dd0445 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.manpages b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.manpages
index e657bdffb..e657bdffb 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.menu b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.menu
index 04a7ab64e..04a7ab64e 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.postinst b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.postinst
index b3a79cc14..b3a79cc14 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/kmenuedit-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install b/ubuntu/_base/tdebase/debian/konqueror-nsplugins-trinity.install
index d916322bc..d916322bc 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-nsplugins-trinity.install
+++ b/ubuntu/_base/tdebase/debian/konqueror-nsplugins-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.docs b/ubuntu/_base/tdebase/debian/konqueror-trinity.docs
index c023d564b..c023d564b 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.docs
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.docs
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install b/ubuntu/_base/tdebase/debian/konqueror-trinity.install
index 6b8800fe4..6b8800fe4 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian b/ubuntu/_base/tdebase/debian/konqueror-trinity.lintian
index 670ed2c27..670ed2c27 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.manpages b/ubuntu/_base/tdebase/debian/konqueror-trinity.manpages
index 8097ed067..8097ed067 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.menu b/ubuntu/_base/tdebase/debian/konqueror-trinity.menu
index 1d2211df6..1d2211df6 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.mime b/ubuntu/_base/tdebase/debian/konqueror-trinity.mime
index 40bfba7c7..40bfba7c7 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.mime
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.mime
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst b/ubuntu/_base/tdebase/debian/konqueror-trinity.postinst
index 4c62f6bf2..4c62f6bf2 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm b/ubuntu/_base/tdebase/debian/konqueror-trinity.prerm
index 829695b10..829695b10 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.prerm
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.prerm
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.presubj b/ubuntu/_base/tdebase/debian/konqueror-trinity.presubj
index 5b17bcbdf..5b17bcbdf 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.presubj
+++ b/ubuntu/_base/tdebase/debian/konqueror-trinity.presubj
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.README.Debian b/ubuntu/_base/tdebase/debian/konsole-trinity.README.Debian
index 1efdb9472..1efdb9472 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.README.Debian
+++ b/ubuntu/_base/tdebase/debian/konsole-trinity.README.Debian
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.install b/ubuntu/_base/tdebase/debian/konsole-trinity.install
index e0ce3e907..e0ce3e907 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.install
+++ b/ubuntu/_base/tdebase/debian/konsole-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian b/ubuntu/_base/tdebase/debian/konsole-trinity.lintian
index 7006dfe10..7006dfe10 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/konsole-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.manpages b/ubuntu/_base/tdebase/debian/konsole-trinity.manpages
index 8c33f637e..8c33f637e 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/konsole-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.menu b/ubuntu/_base/tdebase/debian/konsole-trinity.menu
index 1ab9f2d1c..1ab9f2d1c 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/konsole-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.postinst b/ubuntu/_base/tdebase/debian/konsole-trinity.postinst
index d8be0590f..d8be0590f 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/konsole-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.preinst b/ubuntu/_base/tdebase/debian/konsole-trinity.preinst
index 4b167a51e..4b167a51e 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.preinst
+++ b/ubuntu/_base/tdebase/debian/konsole-trinity.preinst
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.prerm b/ubuntu/_base/tdebase/debian/konsole-trinity.prerm
index fef2d0290..fef2d0290 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.prerm
+++ b/ubuntu/_base/tdebase/debian/konsole-trinity.prerm
diff --git a/ubuntu/maverick/tdebase/debian/kpager-trinity.install b/ubuntu/_base/tdebase/debian/kpager-trinity.install
index 8e7ee184a..8e7ee184a 100644
--- a/ubuntu/maverick/tdebase/debian/kpager-trinity.install
+++ b/ubuntu/_base/tdebase/debian/kpager-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kpager-trinity.manpages b/ubuntu/_base/tdebase/debian/kpager-trinity.manpages
index b34d67959..b34d67959 100644
--- a/ubuntu/maverick/tdebase/debian/kpager-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/kpager-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kpager-trinity.menu b/ubuntu/_base/tdebase/debian/kpager-trinity.menu
index c2ca09021..c2ca09021 100644
--- a/ubuntu/maverick/tdebase/debian/kpager-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/kpager-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/kpersonalizer-trinity.install b/ubuntu/_base/tdebase/debian/kpersonalizer-trinity.install
index 1b0039191..1b0039191 100644
--- a/ubuntu/maverick/tdebase/debian/kpersonalizer-trinity.install
+++ b/ubuntu/_base/tdebase/debian/kpersonalizer-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kpersonalizer-trinity.manpages b/ubuntu/_base/tdebase/debian/kpersonalizer-trinity.manpages
index bcd309b73..bcd309b73 100644
--- a/ubuntu/maverick/tdebase/debian/kpersonalizer-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/kpersonalizer-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kpersonalizer-trinity.menu b/ubuntu/_base/tdebase/debian/kpersonalizer-trinity.menu
index c2152c8a8..c2152c8a8 100644
--- a/ubuntu/maverick/tdebase/debian/kpersonalizer-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/kpersonalizer-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install b/ubuntu/_base/tdebase/debian/ksmserver-trinity.install
index fbbd61ab4..fbbd61ab4 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/_base/tdebase/debian/ksmserver-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/_base/tdebase/debian/ksmserver-trinity.lintian
index 2c7c61596..2c7c61596 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/ksmserver-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages b/ubuntu/_base/tdebase/debian/ksmserver-trinity.manpages
index 354e23800..354e23800 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/ksmserver-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/_base/tdebase/debian/ksmserver-trinity.postinst
index 7983daa09..7983daa09 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/ksmserver-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postrm b/ubuntu/_base/tdebase/debian/ksmserver-trinity.postrm
index b4c661eaa..b4c661eaa 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.postrm
+++ b/ubuntu/_base/tdebase/debian/ksmserver-trinity.postrm
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst b/ubuntu/_base/tdebase/debian/ksmserver-trinity.preinst
index 3465cf922..3465cf922 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.preinst
+++ b/ubuntu/_base/tdebase/debian/ksmserver-trinity.preinst
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm b/ubuntu/_base/tdebase/debian/ksmserver-trinity.prerm
index eb509732a..eb509732a 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.prerm
+++ b/ubuntu/_base/tdebase/debian/ksmserver-trinity.prerm
diff --git a/ubuntu/maverick/tdebase/debian/ksplash-trinity.install b/ubuntu/_base/tdebase/debian/ksplash-trinity.install
index bb548da13..bb548da13 100644
--- a/ubuntu/maverick/tdebase/debian/ksplash-trinity.install
+++ b/ubuntu/_base/tdebase/debian/ksplash-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/ksysguard-trinity.install b/ubuntu/_base/tdebase/debian/ksysguard-trinity.install
index 76ef2bb5c..76ef2bb5c 100644
--- a/ubuntu/maverick/tdebase/debian/ksysguard-trinity.install
+++ b/ubuntu/_base/tdebase/debian/ksysguard-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/ksysguard-trinity.menu b/ubuntu/_base/tdebase/debian/ksysguard-trinity.menu
index 665f15a9f..665f15a9f 100644
--- a/ubuntu/maverick/tdebase/debian/ksysguard-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/ksysguard-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/ksysguardd-trinity.install b/ubuntu/_base/tdebase/debian/ksysguardd-trinity.install
index 644c78911..644c78911 100644
--- a/ubuntu/maverick/tdebase/debian/ksysguardd-trinity.install
+++ b/ubuntu/_base/tdebase/debian/ksysguardd-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/ktip-trinity.install b/ubuntu/_base/tdebase/debian/ktip-trinity.install
index 24890dd4b..24890dd4b 100644
--- a/ubuntu/maverick/tdebase/debian/ktip-trinity.install
+++ b/ubuntu/_base/tdebase/debian/ktip-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/ktip-trinity.menu b/ubuntu/_base/tdebase/debian/ktip-trinity.menu
index 51cc790c4..51cc790c4 100644
--- a/ubuntu/maverick/tdebase/debian/ktip-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/ktip-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/libkonq4-trinity-dev.install b/ubuntu/_base/tdebase/debian/libkonq4-trinity-dev.install
index 499963483..499963483 100644
--- a/ubuntu/maverick/tdebase/debian/libkonq4-trinity-dev.install
+++ b/ubuntu/_base/tdebase/debian/libkonq4-trinity-dev.install
diff --git a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.docs b/ubuntu/_base/tdebase/debian/libkonq4-trinity.docs
index c023d564b..c023d564b 100644
--- a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.docs
+++ b/ubuntu/_base/tdebase/debian/libkonq4-trinity.docs
diff --git a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install b/ubuntu/_base/tdebase/debian/libkonq4-trinity.install
index 15ee2a8d3..15ee2a8d3 100644
--- a/ubuntu/maverick/tdebase/debian/libkonq4-trinity.install
+++ b/ubuntu/_base/tdebase/debian/libkonq4-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/libtqt3-integration-trinity.install b/ubuntu/_base/tdebase/debian/libtqt3-integration-trinity.install
index 9f747bbda..9f747bbda 100644
--- a/ubuntu/maverick/tdebase/debian/libtqt3-integration-trinity.install
+++ b/ubuntu/_base/tdebase/debian/libtqt3-integration-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/local/tdm.options b/ubuntu/_base/tdebase/debian/local/tdm.options
index 05725ae34..05725ae34 100644
--- a/ubuntu/maverick/tdebase/debian/local/tdm.options
+++ b/ubuntu/_base/tdebase/debian/local/tdm.options
diff --git a/ubuntu/maverick/tdebase/debian/local/tdm.options.5 b/ubuntu/_base/tdebase/debian/local/tdm.options.5
index 446271273..446271273 100644
--- a/ubuntu/maverick/tdebase/debian/local/tdm.options.5
+++ b/ubuntu/_base/tdebase/debian/local/tdm.options.5
diff --git a/ubuntu/maverick/tdebase/debian/man/appletproxy-trinity.1 b/ubuntu/_base/tdebase/debian/man/appletproxy-trinity.1
index 3ab13208f..3ab13208f 100644
--- a/ubuntu/maverick/tdebase/debian/man/appletproxy-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/appletproxy-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1 b/ubuntu/_base/tdebase/debian/man/drkonqi-trinity.1
index 987164834..987164834 100644
--- a/ubuntu/maverick/tdebase/debian/man/drkonqi-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/drkonqi-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/extensionproxy-trinity.1 b/ubuntu/_base/tdebase/debian/man/extensionproxy-trinity.1
index 4ea041189..4ea041189 100644
--- a/ubuntu/maverick/tdebase/debian/man/extensionproxy-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/extensionproxy-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/gentdmconf-trinity.1 b/ubuntu/_base/tdebase/debian/man/gentdmconf-trinity.1
index d98e166c2..d98e166c2 100644
--- a/ubuntu/maverick/tdebase/debian/man/gentdmconf-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/gentdmconf-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kappfinder-trinity.1 b/ubuntu/_base/tdebase/debian/man/kappfinder-trinity.1
index ec8eae964..ec8eae964 100644
--- a/ubuntu/maverick/tdebase/debian/man/kappfinder-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kappfinder-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kasbar-trinity.1 b/ubuntu/_base/tdebase/debian/man/kasbar-trinity.1
index 7d57958d2..7d57958d2 100644
--- a/ubuntu/maverick/tdebase/debian/man/kasbar-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kasbar-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kate-trinity.1 b/ubuntu/_base/tdebase/debian/man/kate-trinity.1
index e48268d6f..e48268d6f 100644
--- a/ubuntu/maverick/tdebase/debian/man/kate-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kate-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kblankscrn.kss-trinity.1 b/ubuntu/_base/tdebase/debian/man/kblankscrn.kss-trinity.1
index 46b2d4e1a..46b2d4e1a 100644
--- a/ubuntu/maverick/tdebase/debian/man/kblankscrn.kss-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kblankscrn.kss-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kcheckpass-trinity.1 b/ubuntu/_base/tdebase/debian/man/kcheckpass-trinity.1
index fa5a4c817..fa5a4c817 100644
--- a/ubuntu/maverick/tdebase/debian/man/kcheckpass-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kcheckpass-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kcminit-trinity.1 b/ubuntu/_base/tdebase/debian/man/kcminit-trinity.1
index 4c557456e..4c557456e 100644
--- a/ubuntu/maverick/tdebase/debian/man/kcminit-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kcminit-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kdcop-trinity.1 b/ubuntu/_base/tdebase/debian/man/kdcop-trinity.1
index 1c01dcc47..1c01dcc47 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdcop-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kdcop-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kdialog-trinity.1 b/ubuntu/_base/tdebase/debian/man/kdialog-trinity.1
index 243709ed1..243709ed1 100644
--- a/ubuntu/maverick/tdebase/debian/man/kdialog-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kdialog-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/keditbookmarks-trinity.1 b/ubuntu/_base/tdebase/debian/man/keditbookmarks-trinity.1
index 23606dccb..23606dccb 100644
--- a/ubuntu/maverick/tdebase/debian/man/keditbookmarks-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/keditbookmarks-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kfind-trinity.1 b/ubuntu/_base/tdebase/debian/man/kfind-trinity.1
index 55542fd66..55542fd66 100644
--- a/ubuntu/maverick/tdebase/debian/man/kfind-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kfind-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kfmclient-trinity.1 b/ubuntu/_base/tdebase/debian/man/kfmclient-trinity.1
index 67cbed380..67cbed380 100644
--- a/ubuntu/maverick/tdebase/debian/man/kfmclient-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kfmclient-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/khotkeys-trinity.1 b/ubuntu/_base/tdebase/debian/man/khotkeys-trinity.1
index 34d754b05..34d754b05 100644
--- a/ubuntu/maverick/tdebase/debian/man/khotkeys-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/khotkeys-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kicker-trinity.1 b/ubuntu/_base/tdebase/debian/man/kicker-trinity.1
index 1d17fa199..1d17fa199 100644
--- a/ubuntu/maverick/tdebase/debian/man/kicker-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kicker-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1 b/ubuntu/_base/tdebase/debian/man/kjobviewer-trinity.1
index 6dae2692e..6dae2692e 100644
--- a/ubuntu/maverick/tdebase/debian/man/kjobviewer-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kjobviewer-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kmenuedit-trinity.1 b/ubuntu/_base/tdebase/debian/man/kmenuedit-trinity.1
index fd5c7daf5..fd5c7daf5 100644
--- a/ubuntu/maverick/tdebase/debian/man/kmenuedit-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kmenuedit-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/knetattach-trinity.1 b/ubuntu/_base/tdebase/debian/man/knetattach-trinity.1
index 84bc38fcf..84bc38fcf 100644
--- a/ubuntu/maverick/tdebase/debian/man/knetattach-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/knetattach-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/konqueror-trinity.1 b/ubuntu/_base/tdebase/debian/man/konqueror-trinity.1
index 0515c4f87..0515c4f87 100644
--- a/ubuntu/maverick/tdebase/debian/man/konqueror-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/konqueror-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/konsole-trinity.1 b/ubuntu/_base/tdebase/debian/man/konsole-trinity.1
index 5de5500b4..5de5500b4 100644
--- a/ubuntu/maverick/tdebase/debian/man/konsole-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/konsole-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kpager-trinity.1 b/ubuntu/_base/tdebase/debian/man/kpager-trinity.1
index 63a24f267..63a24f267 100644
--- a/ubuntu/maverick/tdebase/debian/man/kpager-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kpager-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kpersonalizer-trinity.1 b/ubuntu/_base/tdebase/debian/man/kpersonalizer-trinity.1
index 01dc0b3cc..01dc0b3cc 100644
--- a/ubuntu/maverick/tdebase/debian/man/kpersonalizer-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kpersonalizer-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1 b/ubuntu/_base/tdebase/debian/man/kprinter-trinity.1
index a3ecdc88b..a3ecdc88b 100644
--- a/ubuntu/maverick/tdebase/debian/man/kprinter-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kprinter-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/krandom.kss-trinity.1 b/ubuntu/_base/tdebase/debian/man/krandom.kss-trinity.1
index 4a13d95ec..4a13d95ec 100644
--- a/ubuntu/maverick/tdebase/debian/man/krandom.kss-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/krandom.kss-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1 b/ubuntu/_base/tdebase/debian/man/kreadconfig-trinity.1
index 3bb6c4d0b..3bb6c4d0b 100644
--- a/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kreadconfig-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1 b/ubuntu/_base/tdebase/debian/man/krootimage-trinity.1
index e9b19a604..e9b19a604 100644
--- a/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/krootimage-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kstart-trinity.1 b/ubuntu/_base/tdebase/debian/man/kstart-trinity.1
index 9d3a77ddc..9d3a77ddc 100644
--- a/ubuntu/maverick/tdebase/debian/man/kstart-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kstart-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/ksystraycmd-trinity.1 b/ubuntu/_base/tdebase/debian/man/ksystraycmd-trinity.1
index 4807276c0..4807276c0 100644
--- a/ubuntu/maverick/tdebase/debian/man/ksystraycmd-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/ksystraycmd-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/ktrash-trinity.1 b/ubuntu/_base/tdebase/debian/man/ktrash-trinity.1
index 0094c84fa..0094c84fa 100644
--- a/ubuntu/maverick/tdebase/debian/man/ktrash-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/ktrash-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kwrite-trinity.1 b/ubuntu/_base/tdebase/debian/man/kwrite-trinity.1
index f7d39f61d..f7d39f61d 100644
--- a/ubuntu/maverick/tdebase/debian/man/kwrite-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kwrite-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1 b/ubuntu/_base/tdebase/debian/man/kwriteconfig-trinity.1
index b347b9849..b347b9849 100644
--- a/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kwriteconfig-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1 b/ubuntu/_base/tdebase/debian/man/kxkb-trinity.1
index 9a6a6bcf6..9a6a6bcf6 100644
--- a/ubuntu/maverick/tdebase/debian/man/kxkb-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/kxkb-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 b/ubuntu/_base/tdebase/debian/man/starttde-trinity.1
index 73ab27b9c..73ab27b9c 100644
--- a/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/starttde-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdedebugdialog-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdedebugdialog-trinity.1
index af48f59e6..af48f59e6 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdedebugdialog-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdedebugdialog-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
index 1e7b055f6..1e7b055f6 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
index 270dd86e6..270dd86e6 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdepasswd-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdepasswd-trinity.1
index e09aff0e2..e09aff0e2 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdepasswd-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdepasswd-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdeprintfax-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdeprintfax-trinity.1
index e407c294e..e407c294e 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdeprintfax-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdeprintfax-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdesu-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdesu-trinity.1
index fa8c45e09..fa8c45e09 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdesu-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdesu-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdm-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdm-trinity.1
index 1150fe5a8..1150fe5a8 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdm-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdm-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdm_config-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdm_config-trinity.1
index b8753b168..b8753b168 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdm_config-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdm_config-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdm_greet-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdm_greet-trinity.1
index 10b7bde6e..10b7bde6e 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdm_greet-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdm_greet-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/tdmctl-trinity.1 b/ubuntu/_base/tdebase/debian/man/tdmctl-trinity.1
index 82be6ae16..82be6ae16 100644
--- a/ubuntu/maverick/tdebase/debian/man/tdmctl-trinity.1
+++ b/ubuntu/_base/tdebase/debian/man/tdmctl-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/not-installed.list b/ubuntu/_base/tdebase/debian/not-installed.list
index 4e1daf6a1..4e1daf6a1 100644
--- a/ubuntu/maverick/tdebase/debian/not-installed.list
+++ b/ubuntu/_base/tdebase/debian/not-installed.list
diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff b/ubuntu/_base/tdebase/debian/patches/disable_default_tdm_theme.diff
index 45798364e..45798364e 100644
--- a/ubuntu/maverick/tdebase/debian/patches/disable_default_tdm_theme.diff
+++ b/ubuntu/_base/tdebase/debian/patches/disable_default_tdm_theme.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/_base/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 598cd7092..598cd7092 100644
--- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/ubuntu/_base/tdebase/debian/patches/disable_starttde_wallpaper.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
index 79aebbd1d..79aebbd1d 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
index aa97a6a24..aa97a6a24 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
index 608802a75..608802a75 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
index c934da2d5..c934da2d5 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
index 0bbb613a9..0bbb613a9 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
index 878800634..878800634 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
index ad3284bbb..ad3284bbb 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
index 9dfccdbd7..9dfccdbd7 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
index e12245486..e12245486 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
index 009d6f9db..009d6f9db 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
index 3eab104cb..3eab104cb 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
index bfd5fd2af..bfd5fd2af 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
index a46ab143c..a46ab143c 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_48_hide_display.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_48_hide_display.diff
index dddb101e6..dddb101e6 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_48_hide_display.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_48_hide_display.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
index d2ff6732f..d2ff6732f 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
index baeb8bfd5..baeb8bfd5 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
index 8db1221a5..8db1221a5 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/_base/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
index c312b6fb7..c312b6fb7 100644
--- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
+++ b/ubuntu/_base/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff
diff --git a/ubuntu/maverick/tdebase/debian/patches/series b/ubuntu/_base/tdebase/debian/patches/series
index cdb61694a..cdb61694a 100644
--- a/ubuntu/maverick/tdebase/debian/patches/series
+++ b/ubuntu/_base/tdebase/debian/patches/series
diff --git a/ubuntu/maverick/tdebase/debian/po/POTFILES.in b/ubuntu/_base/tdebase/debian/po/POTFILES.in
index 1f7bb4d7d..1f7bb4d7d 100644
--- a/ubuntu/maverick/tdebase/debian/po/POTFILES.in
+++ b/ubuntu/_base/tdebase/debian/po/POTFILES.in
diff --git a/ubuntu/maverick/tdebase/debian/po/ar.po b/ubuntu/_base/tdebase/debian/po/ar.po
index af855c26a..af855c26a 100644
--- a/ubuntu/maverick/tdebase/debian/po/ar.po
+++ b/ubuntu/_base/tdebase/debian/po/ar.po
diff --git a/ubuntu/maverick/tdebase/debian/po/ca.po b/ubuntu/_base/tdebase/debian/po/ca.po
index 8ebfc8aef..8ebfc8aef 100644
--- a/ubuntu/maverick/tdebase/debian/po/ca.po
+++ b/ubuntu/_base/tdebase/debian/po/ca.po
diff --git a/ubuntu/maverick/tdebase/debian/po/cs.po b/ubuntu/_base/tdebase/debian/po/cs.po
index 7cde2a782..7cde2a782 100644
--- a/ubuntu/maverick/tdebase/debian/po/cs.po
+++ b/ubuntu/_base/tdebase/debian/po/cs.po
diff --git a/ubuntu/maverick/tdebase/debian/po/da.po b/ubuntu/_base/tdebase/debian/po/da.po
index c32569242..c32569242 100644
--- a/ubuntu/maverick/tdebase/debian/po/da.po
+++ b/ubuntu/_base/tdebase/debian/po/da.po
diff --git a/ubuntu/maverick/tdebase/debian/po/de.po b/ubuntu/_base/tdebase/debian/po/de.po
index 9bbab12df..9bbab12df 100644
--- a/ubuntu/maverick/tdebase/debian/po/de.po
+++ b/ubuntu/_base/tdebase/debian/po/de.po
diff --git a/ubuntu/maverick/tdebase/debian/po/el.po b/ubuntu/_base/tdebase/debian/po/el.po
index 8f83e1c21..8f83e1c21 100644
--- a/ubuntu/maverick/tdebase/debian/po/el.po
+++ b/ubuntu/_base/tdebase/debian/po/el.po
diff --git a/ubuntu/maverick/tdebase/debian/po/es.po b/ubuntu/_base/tdebase/debian/po/es.po
index 0cd68138d..0cd68138d 100644
--- a/ubuntu/maverick/tdebase/debian/po/es.po
+++ b/ubuntu/_base/tdebase/debian/po/es.po
diff --git a/ubuntu/maverick/tdebase/debian/po/eu.po b/ubuntu/_base/tdebase/debian/po/eu.po
index 82449d87b..82449d87b 100644
--- a/ubuntu/maverick/tdebase/debian/po/eu.po
+++ b/ubuntu/_base/tdebase/debian/po/eu.po
diff --git a/ubuntu/maverick/tdebase/debian/po/fi.po b/ubuntu/_base/tdebase/debian/po/fi.po
index 1a4ac88ac..1a4ac88ac 100644
--- a/ubuntu/maverick/tdebase/debian/po/fi.po
+++ b/ubuntu/_base/tdebase/debian/po/fi.po
diff --git a/ubuntu/maverick/tdebase/debian/po/fr.po b/ubuntu/_base/tdebase/debian/po/fr.po
index 63f9a1d54..63f9a1d54 100644
--- a/ubuntu/maverick/tdebase/debian/po/fr.po
+++ b/ubuntu/_base/tdebase/debian/po/fr.po
diff --git a/ubuntu/maverick/tdebase/debian/po/gl.po b/ubuntu/_base/tdebase/debian/po/gl.po
index c793d5880..c793d5880 100644
--- a/ubuntu/maverick/tdebase/debian/po/gl.po
+++ b/ubuntu/_base/tdebase/debian/po/gl.po
diff --git a/ubuntu/maverick/tdebase/debian/po/it.po b/ubuntu/_base/tdebase/debian/po/it.po
index 07a919ef4..07a919ef4 100644
--- a/ubuntu/maverick/tdebase/debian/po/it.po
+++ b/ubuntu/_base/tdebase/debian/po/it.po
diff --git a/ubuntu/maverick/tdebase/debian/po/ja.po b/ubuntu/_base/tdebase/debian/po/ja.po
index a2062712c..a2062712c 100644
--- a/ubuntu/maverick/tdebase/debian/po/ja.po
+++ b/ubuntu/_base/tdebase/debian/po/ja.po
diff --git a/ubuntu/maverick/tdebase/debian/po/ko.po b/ubuntu/_base/tdebase/debian/po/ko.po
index a357bbcf2..a357bbcf2 100644
--- a/ubuntu/maverick/tdebase/debian/po/ko.po
+++ b/ubuntu/_base/tdebase/debian/po/ko.po
diff --git a/ubuntu/maverick/tdebase/debian/po/ml.po b/ubuntu/_base/tdebase/debian/po/ml.po
index 9b0d050ed..9b0d050ed 100644
--- a/ubuntu/maverick/tdebase/debian/po/ml.po
+++ b/ubuntu/_base/tdebase/debian/po/ml.po
diff --git a/ubuntu/maverick/tdebase/debian/po/nb.po b/ubuntu/_base/tdebase/debian/po/nb.po
index be373ed96..be373ed96 100644
--- a/ubuntu/maverick/tdebase/debian/po/nb.po
+++ b/ubuntu/_base/tdebase/debian/po/nb.po
diff --git a/ubuntu/maverick/tdebase/debian/po/nl.po b/ubuntu/_base/tdebase/debian/po/nl.po
index 246928578..246928578 100644
--- a/ubuntu/maverick/tdebase/debian/po/nl.po
+++ b/ubuntu/_base/tdebase/debian/po/nl.po
diff --git a/ubuntu/maverick/tdebase/debian/po/pl.po b/ubuntu/_base/tdebase/debian/po/pl.po
index d6a6b2aa4..d6a6b2aa4 100644
--- a/ubuntu/maverick/tdebase/debian/po/pl.po
+++ b/ubuntu/_base/tdebase/debian/po/pl.po
diff --git a/ubuntu/maverick/tdebase/debian/po/pt.po b/ubuntu/_base/tdebase/debian/po/pt.po
index 4fec6a6c6..4fec6a6c6 100644
--- a/ubuntu/maverick/tdebase/debian/po/pt.po
+++ b/ubuntu/_base/tdebase/debian/po/pt.po
diff --git a/ubuntu/maverick/tdebase/debian/po/pt_BR.po b/ubuntu/_base/tdebase/debian/po/pt_BR.po
index d01bf0dc7..d01bf0dc7 100644
--- a/ubuntu/maverick/tdebase/debian/po/pt_BR.po
+++ b/ubuntu/_base/tdebase/debian/po/pt_BR.po
diff --git a/ubuntu/maverick/tdebase/debian/po/ro.po b/ubuntu/_base/tdebase/debian/po/ro.po
index 3db232dce..3db232dce 100644
--- a/ubuntu/maverick/tdebase/debian/po/ro.po
+++ b/ubuntu/_base/tdebase/debian/po/ro.po
diff --git a/ubuntu/maverick/tdebase/debian/po/ru.po b/ubuntu/_base/tdebase/debian/po/ru.po
index e6c70d0e8..e6c70d0e8 100644
--- a/ubuntu/maverick/tdebase/debian/po/ru.po
+++ b/ubuntu/_base/tdebase/debian/po/ru.po
diff --git a/ubuntu/maverick/tdebase/debian/po/sk.po b/ubuntu/_base/tdebase/debian/po/sk.po
index 7eed2c613..7eed2c613 100644
--- a/ubuntu/maverick/tdebase/debian/po/sk.po
+++ b/ubuntu/_base/tdebase/debian/po/sk.po
diff --git a/ubuntu/maverick/tdebase/debian/po/sv.po b/ubuntu/_base/tdebase/debian/po/sv.po
index f6295d08e..f6295d08e 100644
--- a/ubuntu/maverick/tdebase/debian/po/sv.po
+++ b/ubuntu/_base/tdebase/debian/po/sv.po
diff --git a/ubuntu/maverick/tdebase/debian/po/ta.po b/ubuntu/_base/tdebase/debian/po/ta.po
index 757adef2d..757adef2d 100644
--- a/ubuntu/maverick/tdebase/debian/po/ta.po
+++ b/ubuntu/_base/tdebase/debian/po/ta.po
diff --git a/ubuntu/maverick/tdebase/debian/po/templates.pot b/ubuntu/_base/tdebase/debian/po/templates.pot
index 29e505209..29e505209 100644
--- a/ubuntu/maverick/tdebase/debian/po/templates.pot
+++ b/ubuntu/_base/tdebase/debian/po/templates.pot
diff --git a/ubuntu/maverick/tdebase/debian/po/tr.po b/ubuntu/_base/tdebase/debian/po/tr.po
index f6bd6cd2b..f6bd6cd2b 100644
--- a/ubuntu/maverick/tdebase/debian/po/tr.po
+++ b/ubuntu/_base/tdebase/debian/po/tr.po
diff --git a/ubuntu/maverick/tdebase/debian/po/vi.po b/ubuntu/_base/tdebase/debian/po/vi.po
index 27100c9b8..27100c9b8 100644
--- a/ubuntu/maverick/tdebase/debian/po/vi.po
+++ b/ubuntu/_base/tdebase/debian/po/vi.po
diff --git a/ubuntu/maverick/tdebase/debian/po/zh_CN.po b/ubuntu/_base/tdebase/debian/po/zh_CN.po
index 489335022..489335022 100644
--- a/ubuntu/maverick/tdebase/debian/po/zh_CN.po
+++ b/ubuntu/_base/tdebase/debian/po/zh_CN.po
diff --git a/ubuntu/maverick/tdebase/debian/prune-nonfree b/ubuntu/_base/tdebase/debian/prune-nonfree
index 4fa832d5c..4fa832d5c 100644
--- a/ubuntu/maverick/tdebase/debian/prune-nonfree
+++ b/ubuntu/_base/tdebase/debian/prune-nonfree
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/_base/tdebase/debian/rules
index 216a616be..216a616be 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/_base/tdebase/debian/rules
diff --git a/ubuntu/maverick/tdebase/debian/source.lintian-overrides b/ubuntu/_base/tdebase/debian/source.lintian-overrides
index 06e452243..06e452243 100644
--- a/ubuntu/maverick/tdebase/debian/source.lintian-overrides
+++ b/ubuntu/_base/tdebase/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/tdebase/debian/source/format b/ubuntu/_base/tdebase/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdebase/debian/source/format
+++ b/ubuntu/_base/tdebase/debian/source/format
diff --git a/ubuntu/maverick/tdebase/debian/source/options b/ubuntu/_base/tdebase/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdebase/debian/source/options
+++ b/ubuntu/_base/tdebase/debian/source/options
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/tdebase/debian/tdebase-data-trinity.install
index e626e8a60..e626e8a60 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-data-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.preinst b/ubuntu/_base/tdebase/debian/tdebase-data-trinity.preinst
index 9c62c3209..9c62c3209 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.preinst
+++ b/ubuntu/_base/tdebase/debian/tdebase-data-trinity.preinst
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kate b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kate
index 6f137f5bd..6f137f5bd 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kate
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kate
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.keditbookmarks b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.keditbookmarks
index fb1a03931..fb1a03931 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.keditbookmarks
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.keditbookmarks
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kfind b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kfind
index 9db8293c7..9db8293c7 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kfind
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kfind
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kicker b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kicker
index 1d6269440..1d6269440 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kicker
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kicker
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.klipper b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.klipper
index cbfb08f2d..cbfb08f2d 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.klipper
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.klipper
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
index ff6a0b3fc..ff6a0b3fc 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kmenuedit
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konqueror b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.konqueror
index 785e9ba10..785e9ba10 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konqueror
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.konqueror
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konsole b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.konsole
index a91c7d786..a91c7d786 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.konsole
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.konsole
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kpager b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kpager
index a5b5a8e19..a5b5a8e19 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kpager
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.kpager
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.ksysguard b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.ksysguard
index 05b35a51f..05b35a51f 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.ksysguard
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.ksysguard
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
index 78183cf11..78183cf11 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.tdm
index 65baf3a32..65baf3a32 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdm
+++ b/ubuntu/_base/tdebase/debian/tdebase-doc-html.doc-base.tdm
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install b/ubuntu/_base/tdebase/debian/tdebase-runtime-data-common-trinity.install
index c7a9a3fbf..c7a9a3fbf 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-runtime-data-common-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
index 9af35d9f9..9af35d9f9 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
+++ b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.README.Debian
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index a84f4e29a..a84f4e29a 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
index 249292ad7..249292ad7 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-smb-trinity.install b/ubuntu/_base/tdebase/debian/tdebase-tdeio-smb-trinity.install
index 3bce0d8b2..3bce0d8b2 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-smb-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-tdeio-smb-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.install
index 7a27b210a..7a27b210a 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.install
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.links
index 975b98403..975b98403 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.links
+++ b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.links
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.lintian
index 6501cf36b..6501cf36b 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.lintian
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.manpages
index 92b784172..92b784172 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.manpages
+++ b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.manpages
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.menu b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.menu
index f3de6d0af..f3de6d0af 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.menu
+++ b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.menu
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.postinst b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.postinst
index e0d103825..e0d103825 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.postinst
+++ b/ubuntu/_base/tdebase/debian/tdebase-trinity-bin.postinst
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install b/ubuntu/_base/tdebase/debian/tdebase-trinity-dev.install
index 1d4b759ad..1d4b759ad 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-dev.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-trinity-dev.install
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-doc.install b/ubuntu/_base/tdebase/debian/tdebase-trinity-doc.install
index e286a6891..e286a6891 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-doc.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-trinity-doc.install
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian b/ubuntu/_base/tdebase/debian/tdebase-trinity.README.Debian
index 2d03bb326..2d03bb326 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian
+++ b/ubuntu/_base/tdebase/debian/tdebase-trinity.README.Debian
diff --git a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install b/ubuntu/_base/tdebase/debian/tdepasswd-trinity.install
index a951e7daf..a951e7daf 100644
--- a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdepasswd-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.manpages b/ubuntu/_base/tdebase/debian/tdepasswd-trinity.manpages
index 1a6f4abad..1a6f4abad 100644
--- a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/tdepasswd-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.menu b/ubuntu/_base/tdebase/debian/tdepasswd-trinity.menu
index 9177ab1d8..9177ab1d8 100644
--- a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/tdepasswd-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install b/ubuntu/_base/tdebase/debian/tdeprint-trinity.install
index fa3ba9266..fa3ba9266 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdeprint-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/_base/tdebase/debian/tdeprint-trinity.lintian
index 52cd10d88..52cd10d88 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/tdeprint-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.manpages b/ubuntu/_base/tdebase/debian/tdeprint-trinity.manpages
index 55b9bfae7..55b9bfae7 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/tdeprint-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.menu b/ubuntu/_base/tdebase/debian/tdeprint-trinity.menu
index 4da234790..4da234790 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.menu
+++ b/ubuntu/_base/tdebase/debian/tdeprint-trinity.menu
diff --git a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.postinst b/ubuntu/_base/tdebase/debian/tdeprint-trinity.postinst
index c812a9390..c812a9390 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/tdeprint-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/tdescreensaver-trinity.pam b/ubuntu/_base/tdebase/debian/tdescreensaver-trinity.pam
index 9a2c74519..9a2c74519 100644
--- a/ubuntu/maverick/tdebase/debian/tdescreensaver-trinity.pam
+++ b/ubuntu/_base/tdebase/debian/tdescreensaver-trinity.pam
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity-np.pam b/ubuntu/_base/tdebase/debian/tdm-trinity-np.pam
index 4cada235b..4cada235b 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity-np.pam
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity-np.pam
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.README.Debian b/ubuntu/_base/tdebase/debian/tdm-trinity.README.Debian
index 60a81e267..60a81e267 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.README.Debian
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.README.Debian
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.conf b/ubuntu/_base/tdebase/debian/tdm-trinity.conf
index 61260c91f..61260c91f 100755
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.conf
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.config b/ubuntu/_base/tdebase/debian/tdm-trinity.config
index 1d73249f7..1d73249f7 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.config
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.config
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.dirs b/ubuntu/_base/tdebase/debian/tdm-trinity.dirs
index 2060b348d..2060b348d 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.dirs
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.dirs
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/_base/tdebase/debian/tdm-trinity.install
index e84c384b9..e84c384b9 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.links b/ubuntu/_base/tdebase/debian/tdm-trinity.links
index d39f29e96..d39f29e96 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.links
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.links
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.logrotate b/ubuntu/_base/tdebase/debian/tdm-trinity.logrotate
index 7a7dab37b..7a7dab37b 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.logrotate
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.logrotate
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.manpages b/ubuntu/_base/tdebase/debian/tdm-trinity.manpages
index 690a0f462..690a0f462 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.manpages
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.needrestart b/ubuntu/_base/tdebase/debian/tdm-trinity.needrestart
index 07fed1702..07fed1702 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.needrestart
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.needrestart
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.pam b/ubuntu/_base/tdebase/debian/tdm-trinity.pam
index d40a52277..d40a52277 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.pam
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.pam
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst b/ubuntu/_base/tdebase/debian/tdm-trinity.postinst
index 5686056a7..5686056a7 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.postrm b/ubuntu/_base/tdebase/debian/tdm-trinity.postrm
index 3dfb32123..3dfb32123 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.postrm
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.postrm
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.preinst b/ubuntu/_base/tdebase/debian/tdm-trinity.preinst
index ee6aa00a1..ee6aa00a1 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.preinst
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.preinst
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.prerm b/ubuntu/_base/tdebase/debian/tdm-trinity.prerm
index 6247adb1f..6247adb1f 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.prerm
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.prerm
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.templates b/ubuntu/_base/tdebase/debian/tdm-trinity.templates
index ac4f2df43..ac4f2df43 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.templates
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.templates
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt b/ubuntu/_base/tdebase/debian/tdm-trinity.txt
index 2aa4cd688..2aa4cd688 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt
+++ b/ubuntu/_base/tdebase/debian/tdm-trinity.txt
diff --git a/ubuntu/maverick/tdebase/debian/tdm.service b/ubuntu/_base/tdebase/debian/tdm.service
index 349823a9f..349823a9f 100644
--- a/ubuntu/maverick/tdebase/debian/tdm.service
+++ b/ubuntu/_base/tdebase/debian/tdm.service
diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.install b/ubuntu/_base/tdebase/debian/twin-trinity.install
index 381a173be..381a173be 100644
--- a/ubuntu/maverick/tdebase/debian/twin-trinity.install
+++ b/ubuntu/_base/tdebase/debian/twin-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.lintian b/ubuntu/_base/tdebase/debian/twin-trinity.lintian
index d0cfc8eb8..d0cfc8eb8 100644
--- a/ubuntu/maverick/tdebase/debian/twin-trinity.lintian
+++ b/ubuntu/_base/tdebase/debian/twin-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.postinst b/ubuntu/_base/tdebase/debian/twin-trinity.postinst
index b8273333f..b8273333f 100644
--- a/ubuntu/maverick/tdebase/debian/twin-trinity.postinst
+++ b/ubuntu/_base/tdebase/debian/twin-trinity.postinst
diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.prerm b/ubuntu/_base/tdebase/debian/twin-trinity.prerm
index 683b3c66b..683b3c66b 100644
--- a/ubuntu/maverick/tdebase/debian/twin-trinity.prerm
+++ b/ubuntu/_base/tdebase/debian/twin-trinity.prerm
diff --git a/ubuntu/maverick/tdebase/debian/ubuntu.xmodmap b/ubuntu/_base/tdebase/debian/ubuntu.xmodmap
index 2dcca54c5..2dcca54c5 100644
--- a/ubuntu/maverick/tdebase/debian/ubuntu.xmodmap
+++ b/ubuntu/_base/tdebase/debian/ubuntu.xmodmap
diff --git a/ubuntu/maverick/tdebase/debian/usermap.pl b/ubuntu/_base/tdebase/debian/usermap.pl
index 9c8c61f26..9c8c61f26 100644
--- a/ubuntu/maverick/tdebase/debian/usermap.pl
+++ b/ubuntu/_base/tdebase/debian/usermap.pl
diff --git a/ubuntu/maverick/tdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 91e47fe4d..91e47fe4d 100644
--- a/ubuntu/maverick/tdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdebindings/debian/cdbs/debian-qt-kde.mk
index 9d9e88991..9d9e88991 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdebindings/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk b/ubuntu/_base/tdebindings/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdebindings/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/versions.pl b/ubuntu/_base/tdebindings/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdebindings/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdebindings/debian/changelog b/ubuntu/_base/tdebindings/debian/changelog
index 91696228c..91696228c 100644
--- a/ubuntu/maverick/tdebindings/debian/changelog
+++ b/ubuntu/_base/tdebindings/debian/changelog
diff --git a/ubuntu/maverick/tdebindings/debian/compat b/ubuntu/_base/tdebindings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdebindings/debian/compat
+++ b/ubuntu/_base/tdebindings/debian/compat
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/_base/tdebindings/debian/control
index a8db43a33..a8db43a33 100644
--- a/ubuntu/maverick/tdebindings/debian/control
+++ b/ubuntu/_base/tdebindings/debian/control
diff --git a/ubuntu/maverick/tdebindings/debian/copyright b/ubuntu/_base/tdebindings/debian/copyright
index 40047d0f9..40047d0f9 100644
--- a/ubuntu/maverick/tdebindings/debian/copyright
+++ b/ubuntu/_base/tdebindings/debian/copyright
diff --git a/ubuntu/maverick/tdebindings/debian/juic-trinity.install b/ubuntu/_base/tdebindings/debian/juic-trinity.install
index b29210f2c..b29210f2c 100644
--- a/ubuntu/maverick/tdebindings/debian/juic-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/juic-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/juic-trinity.manpages b/ubuntu/_base/tdebindings/debian/juic-trinity.manpages
index 3b2609197..3b2609197 100644
--- a/ubuntu/maverick/tdebindings/debian/juic-trinity.manpages
+++ b/ubuntu/_base/tdebindings/debian/juic-trinity.manpages
diff --git a/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.install b/ubuntu/_base/tdebindings/debian/kjscmd-trinity.install
index a8786e459..a8786e459 100644
--- a/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/kjscmd-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.links b/ubuntu/_base/tdebindings/debian/kjscmd-trinity.links
index 2305663ec..2305663ec 100644
--- a/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.links
+++ b/ubuntu/_base/tdebindings/debian/kjscmd-trinity.links
diff --git a/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu b/ubuntu/_base/tdebindings/debian/kjscmd-trinity.menu
index be36546ba..be36546ba 100644
--- a/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu
+++ b/ubuntu/_base/tdebindings/debian/kjscmd-trinity.menu
diff --git a/ubuntu/maverick/tdebindings/debian/konqueror-kjsembed-plugin-trinity.install b/ubuntu/_base/tdebindings/debian/konqueror-kjsembed-plugin-trinity.install
index e37ad763e..e37ad763e 100644
--- a/ubuntu/maverick/tdebindings/debian/konqueror-kjsembed-plugin-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/konqueror-kjsembed-plugin-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libdcop-perl-trinity.docs b/ubuntu/_base/tdebindings/debian/libdcop-perl-trinity.docs
index 869f451fd..869f451fd 100644
--- a/ubuntu/maverick/tdebindings/debian/libdcop-perl-trinity.docs
+++ b/ubuntu/_base/tdebindings/debian/libdcop-perl-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libdcop-perl-trinity.install b/ubuntu/_base/tdebindings/debian/libdcop-perl-trinity.install
index b01687bab..b01687bab 100644
--- a/ubuntu/maverick/tdebindings/debian/libdcop-perl-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libdcop-perl-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity-dev.install b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity-dev.install
index c1fa59ac4..c1fa59ac4 100644
--- a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity-dev.install
+++ b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity-dev.install
diff --git a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity-dev.links b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity-dev.links
index ad842107e..ad842107e 100644
--- a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity-dev.links
+++ b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity-dev.links
diff --git a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity-dev.manpages b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity-dev.manpages
index 74e63033b..74e63033b 100644
--- a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity-dev.manpages
+++ b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity-dev.manpages
diff --git a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity.install b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity.install
index 024aecc38..024aecc38 100644
--- a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity.links b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity.links
index 15127ed24..15127ed24 100644
--- a/ubuntu/maverick/tdebindings/debian/libdcop3-java-trinity.links
+++ b/ubuntu/_base/tdebindings/debian/libdcop3-java-trinity.links
diff --git a/ubuntu/maverick/tdebindings/debian/libdcop3-jni-trinity.install b/ubuntu/_base/tdebindings/debian/libdcop3-jni-trinity.install
index 99f72f148..99f72f148 100644
--- a/ubuntu/maverick/tdebindings/debian/libdcop3-jni-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libdcop3-jni-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.dirs b/ubuntu/_base/tdebindings/debian/libkjsembed-trinity-dev.dirs
index f9e762e38..f9e762e38 100644
--- a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.dirs
+++ b/ubuntu/_base/tdebindings/debian/libkjsembed-trinity-dev.dirs
diff --git a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.docs b/ubuntu/_base/tdebindings/debian/libkjsembed-trinity-dev.docs
index bd723f85c..bd723f85c 100644
--- a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.docs
+++ b/ubuntu/_base/tdebindings/debian/libkjsembed-trinity-dev.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install b/ubuntu/_base/tdebindings/debian/libkjsembed-trinity-dev.install
index 6b71195db..6b71195db 100644
--- a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install
+++ b/ubuntu/_base/tdebindings/debian/libkjsembed-trinity-dev.install
diff --git a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.links b/ubuntu/_base/tdebindings/debian/libkjsembed-trinity-dev.links
index a9e53e9a4..a9e53e9a4 100644
--- a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.links
+++ b/ubuntu/_base/tdebindings/debian/libkjsembed-trinity-dev.links
diff --git a/ubuntu/maverick/tdebindings/debian/libkjsembed1-trinity.docs b/ubuntu/_base/tdebindings/debian/libkjsembed1-trinity.docs
index 4c40dd769..4c40dd769 100644
--- a/ubuntu/maverick/tdebindings/debian/libkjsembed1-trinity.docs
+++ b/ubuntu/_base/tdebindings/debian/libkjsembed1-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libkjsembed1-trinity.install b/ubuntu/_base/tdebindings/debian/libkjsembed1-trinity.install
index 0061252bb..0061252bb 100644
--- a/ubuntu/maverick/tdebindings/debian/libkjsembed1-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libkjsembed1-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.docs b/ubuntu/_base/tdebindings/debian/libkorundum0-ruby-trinity.docs
index fcf01a118..fcf01a118 100644
--- a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.docs
+++ b/ubuntu/_base/tdebindings/debian/libkorundum0-ruby-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install b/ubuntu/_base/tdebindings/debian/libkorundum0-ruby-trinity.install
index 33de286bb..33de286bb 100644
--- a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libkorundum0-ruby-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.manpages b/ubuntu/_base/tdebindings/debian/libkorundum0-ruby-trinity.manpages
index ab2f0ee35..ab2f0ee35 100644
--- a/ubuntu/maverick/tdebindings/debian/libkorundum0-ruby-trinity.manpages
+++ b/ubuntu/_base/tdebindings/debian/libkorundum0-ruby-trinity.manpages
diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.docs b/ubuntu/_base/tdebindings/debian/libqt0-ruby-trinity.docs
index a6f9fffce..a6f9fffce 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.docs
+++ b/ubuntu/_base/tdebindings/debian/libqt0-ruby-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install b/ubuntu/_base/tdebindings/debian/libqt0-ruby-trinity.install
index a18befa22..a18befa22 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libqt0-ruby-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.manpages b/ubuntu/_base/tdebindings/debian/libqt0-ruby-trinity.manpages
index f2dc6de31..f2dc6de31 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby-trinity.manpages
+++ b/ubuntu/_base/tdebindings/debian/libqt0-ruby-trinity.manpages
diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.README.Debian
index 7db60302b..7db60302b 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.README.Debian
+++ b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.README.Debian
diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.dirs b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.dirs
index 9fe145a6d..9fe145a6d 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.dirs
+++ b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.dirs
diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.docs b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.docs
index b10168041..b10168041 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.docs
+++ b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.install b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.install
index 0b068bc53..0b068bc53 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.links b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.links
index 04f3160e8..04f3160e8 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt3-java-trinity.links
+++ b/ubuntu/_base/tdebindings/debian/libqt3-java-trinity.links
diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-jni-trinity.docs b/ubuntu/_base/tdebindings/debian/libqt3-jni-trinity.docs
index 90a6f2219..90a6f2219 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt3-jni-trinity.docs
+++ b/ubuntu/_base/tdebindings/debian/libqt3-jni-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libqt3-jni-trinity.install b/ubuntu/_base/tdebindings/debian/libqt3-jni-trinity.install
index 0c879683b..0c879683b 100644
--- a/ubuntu/maverick/tdebindings/debian/libqt3-jni-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libqt3-jni-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.install b/ubuntu/_base/tdebindings/debian/libsmoketde-trinity-dev.install
index ccc7952cf..ccc7952cf 100644
--- a/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.install
+++ b/ubuntu/_base/tdebindings/debian/libsmoketde-trinity-dev.install
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.links b/ubuntu/_base/tdebindings/debian/libsmoketde-trinity-dev.links
index bc9055637..bc9055637 100644
--- a/ubuntu/maverick/tdebindings/debian/libsmoketde-trinity-dev.links
+++ b/ubuntu/_base/tdebindings/debian/libsmoketde-trinity-dev.links
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketde1-trinity.install b/ubuntu/_base/tdebindings/debian/libsmoketde1-trinity.install
index d36233050..d36233050 100644
--- a/ubuntu/maverick/tdebindings/debian/libsmoketde1-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libsmoketde1-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.install b/ubuntu/_base/tdebindings/debian/libsmoketqt-trinity-dev.install
index 663329673..663329673 100644
--- a/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.install
+++ b/ubuntu/_base/tdebindings/debian/libsmoketqt-trinity-dev.install
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.links b/ubuntu/_base/tdebindings/debian/libsmoketqt-trinity-dev.links
index 36cc65f6e..36cc65f6e 100644
--- a/ubuntu/maverick/tdebindings/debian/libsmoketqt-trinity-dev.links
+++ b/ubuntu/_base/tdebindings/debian/libsmoketqt-trinity-dev.links
diff --git a/ubuntu/maverick/tdebindings/debian/libsmoketqt1-trinity.install b/ubuntu/_base/tdebindings/debian/libsmoketqt1-trinity.install
index 9b2cbbe21..9b2cbbe21 100644
--- a/ubuntu/maverick/tdebindings/debian/libsmoketqt1-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libsmoketqt1-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.README.Debian b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.README.Debian
index 3b86843c2..3b86843c2 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.README.Debian
+++ b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.README.Debian
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.dirs b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.dirs
index 02807ba4b..02807ba4b 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.dirs
+++ b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.dirs
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.docs b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.docs
index a2e63686d..a2e63686d 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.docs
+++ b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.install b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.install
index 9ea8f63c7..9ea8f63c7 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.links b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.links
index 3d5d71d6a..3d5d71d6a 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-java-trinity.links
+++ b/ubuntu/_base/tdebindings/debian/libtrinity-java-trinity.links
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.docs b/ubuntu/_base/tdebindings/debian/libtrinity-jni-trinity.docs
index 6948746d5..6948746d5 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.docs
+++ b/ubuntu/_base/tdebindings/debian/libtrinity-jni-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.install b/ubuntu/_base/tdebindings/debian/libtrinity-jni-trinity.install
index e0450f12b..e0450f12b 100644
--- a/ubuntu/maverick/tdebindings/debian/libtrinity-jni-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/libtrinity-jni-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/local/dcopidl2java.1 b/ubuntu/_base/tdebindings/debian/local/dcopidl2java.1
index 926d78391..926d78391 100644
--- a/ubuntu/maverick/tdebindings/debian/local/dcopidl2java.1
+++ b/ubuntu/_base/tdebindings/debian/local/dcopidl2java.1
diff --git a/ubuntu/maverick/tdebindings/debian/local/juic.1 b/ubuntu/_base/tdebindings/debian/local/juic.1
index 9120f44d3..9120f44d3 100644
--- a/ubuntu/maverick/tdebindings/debian/local/juic.1
+++ b/ubuntu/_base/tdebindings/debian/local/juic.1
diff --git a/ubuntu/maverick/tdebindings/debian/local/krubyinit.1 b/ubuntu/_base/tdebindings/debian/local/krubyinit.1
index f8a405452..f8a405452 100644
--- a/ubuntu/maverick/tdebindings/debian/local/krubyinit.1
+++ b/ubuntu/_base/tdebindings/debian/local/krubyinit.1
diff --git a/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1 b/ubuntu/_base/tdebindings/debian/local/qtrubyinit.1
index 1ab6e7f28..1ab6e7f28 100644
--- a/ubuntu/maverick/tdebindings/debian/local/qtrubyinit.1
+++ b/ubuntu/_base/tdebindings/debian/local/qtrubyinit.1
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1 b/ubuntu/_base/tdebindings/debian/local/rbqtapi.1
index 7cafb5b8c..7cafb5b8c 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbqtapi.1
+++ b/ubuntu/_base/tdebindings/debian/local/rbqtapi.1
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1 b/ubuntu/_base/tdebindings/debian/local/rbqtsh.1
index bda49d962..bda49d962 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbqtsh.1
+++ b/ubuntu/_base/tdebindings/debian/local/rbqtsh.1
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbtdeapi.1 b/ubuntu/_base/tdebindings/debian/local/rbtdeapi.1
index e3d166225..e3d166225 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbtdeapi.1
+++ b/ubuntu/_base/tdebindings/debian/local/rbtdeapi.1
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbtdesh.1 b/ubuntu/_base/tdebindings/debian/local/rbtdesh.1
index 6e792e7fa..6e792e7fa 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbtdesh.1
+++ b/ubuntu/_base/tdebindings/debian/local/rbtdesh.1
diff --git a/ubuntu/maverick/tdebindings/debian/local/rbuic.1 b/ubuntu/_base/tdebindings/debian/local/rbuic.1
index d59caa1ac..d59caa1ac 100644
--- a/ubuntu/maverick/tdebindings/debian/local/rbuic.1
+++ b/ubuntu/_base/tdebindings/debian/local/rbuic.1
diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdebindings/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdebindings/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdebindings/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/05_pedantic-errors.diff b/ubuntu/_base/tdebindings/debian/patches/common/05_pedantic-errors.diff
index ce2883918..ce2883918 100644
--- a/ubuntu/maverick/tdebindings/debian/patches/common/05_pedantic-errors.diff
+++ b/ubuntu/_base/tdebindings/debian/patches/common/05_pedantic-errors.diff
diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdebindings/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdebindings/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdebindings/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdebindings/debian/python-dcop-trinity.docs b/ubuntu/_base/tdebindings/debian/python-dcop-trinity.docs
index 957d3af3e..957d3af3e 100644
--- a/ubuntu/maverick/tdebindings/debian/python-dcop-trinity.docs
+++ b/ubuntu/_base/tdebindings/debian/python-dcop-trinity.docs
diff --git a/ubuntu/maverick/tdebindings/debian/python-dcop-trinity.examples b/ubuntu/_base/tdebindings/debian/python-dcop-trinity.examples
index 4100d465b..4100d465b 100644
--- a/ubuntu/maverick/tdebindings/debian/python-dcop-trinity.examples
+++ b/ubuntu/_base/tdebindings/debian/python-dcop-trinity.examples
diff --git a/ubuntu/maverick/tdebindings/debian/python-dcop-trinity.install b/ubuntu/_base/tdebindings/debian/python-dcop-trinity.install
index 364b52d9d..364b52d9d 100644
--- a/ubuntu/maverick/tdebindings/debian/python-dcop-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/python-dcop-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/_base/tdebindings/debian/rules
index ad0ffa221..ad0ffa221 100755
--- a/ubuntu/maverick/tdebindings/debian/rules
+++ b/ubuntu/_base/tdebindings/debian/rules
diff --git a/ubuntu/maverick/tdebindings/debian/source/format b/ubuntu/_base/tdebindings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdebindings/debian/source/format
+++ b/ubuntu/_base/tdebindings/debian/source/format
diff --git a/ubuntu/maverick/tdebindings/debian/source/options b/ubuntu/_base/tdebindings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdebindings/debian/source/options
+++ b/ubuntu/_base/tdebindings/debian/source/options
diff --git a/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install b/ubuntu/_base/tdebindings/debian/tde-xparts-extras-trinity.install
index debb8165a..debb8165a 100644
--- a/ubuntu/maverick/tdebindings/debian/tde-xparts-extras-trinity.install
+++ b/ubuntu/_base/tdebindings/debian/tde-xparts-extras-trinity.install
diff --git a/ubuntu/maverick/tdebindings/debian/tdebindings-java-trinity.links b/ubuntu/_base/tdebindings/debian/tdebindings-java-trinity.links
index 4d4c4e700..4d4c4e700 100644
--- a/ubuntu/maverick/tdebindings/debian/tdebindings-java-trinity.links
+++ b/ubuntu/_base/tdebindings/debian/tdebindings-java-trinity.links
diff --git a/ubuntu/maverick/tdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 385c47c14..385c47c14 100644
--- a/ubuntu/maverick/tdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdeedu/debian/blinken-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/blinken-trinity.README.Debian
index 1680d27f9..1680d27f9 100644
--- a/ubuntu/maverick/tdeedu/debian/blinken-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/blinken-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/blinken-trinity.docs b/ubuntu/_base/tdeedu/debian/blinken-trinity.docs
index 8fce6fbad..8fce6fbad 100644
--- a/ubuntu/maverick/tdeedu/debian/blinken-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/blinken-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/blinken-trinity.install b/ubuntu/_base/tdeedu/debian/blinken-trinity.install
index 033f1086c..033f1086c 100644
--- a/ubuntu/maverick/tdeedu/debian/blinken-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/blinken-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/blinken-trinity.manpages b/ubuntu/_base/tdeedu/debian/blinken-trinity.manpages
index bbad38ebc..bbad38ebc 100644
--- a/ubuntu/maverick/tdeedu/debian/blinken-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/blinken-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/blinken-trinity.menu b/ubuntu/_base/tdeedu/debian/blinken-trinity.menu
index e0bf88bac..e0bf88bac 100644
--- a/ubuntu/maverick/tdeedu/debian/blinken-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/blinken-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdeedu/debian/cdbs/debian-qt-kde.mk
index 91a547ea9..91a547ea9 100644
--- a/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdeedu/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk b/ubuntu/_base/tdeedu/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdeedu/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdeedu/debian/cdbs/versions.pl b/ubuntu/_base/tdeedu/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdeedu/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdeedu/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdeedu/debian/changelog b/ubuntu/_base/tdeedu/debian/changelog
index 3d8b1f5aa..3d8b1f5aa 100644
--- a/ubuntu/maverick/tdeedu/debian/changelog
+++ b/ubuntu/_base/tdeedu/debian/changelog
diff --git a/ubuntu/maverick/tdeedu/debian/compat b/ubuntu/_base/tdeedu/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdeedu/debian/compat
+++ b/ubuntu/_base/tdeedu/debian/compat
diff --git a/ubuntu/maverick/tdeedu/debian/control b/ubuntu/_base/tdeedu/debian/control
index 922988821..922988821 100644
--- a/ubuntu/maverick/tdeedu/debian/control
+++ b/ubuntu/_base/tdeedu/debian/control
diff --git a/ubuntu/maverick/tdeedu/debian/copyright b/ubuntu/_base/tdeedu/debian/copyright
index a7ca45956..a7ca45956 100644
--- a/ubuntu/maverick/tdeedu/debian/copyright
+++ b/ubuntu/_base/tdeedu/debian/copyright
diff --git a/ubuntu/maverick/tdeedu/debian/icons/blinken.xpm b/ubuntu/_base/tdeedu/debian/icons/blinken.xpm
index 9aef8553a..9aef8553a 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/blinken.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/blinken.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kalzium.xpm b/ubuntu/_base/tdeedu/debian/icons/kalzium.xpm
index 3f265dcc9..3f265dcc9 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kalzium.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kalzium.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kanagram.xpm b/ubuntu/_base/tdeedu/debian/icons/kanagram.xpm
index d8fa0895d..d8fa0895d 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kanagram.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kanagram.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kbruch.xpm b/ubuntu/_base/tdeedu/debian/icons/kbruch.xpm
index 9c4c6d33e..9c4c6d33e 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kbruch.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kbruch.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/keduca.xpm b/ubuntu/_base/tdeedu/debian/icons/keduca.xpm
index e4ddce938..e4ddce938 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/keduca.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/keduca.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kgeography.xpm b/ubuntu/_base/tdeedu/debian/icons/kgeography.xpm
index 34e91c81f..34e91c81f 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kgeography.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kgeography.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/khangman.xpm b/ubuntu/_base/tdeedu/debian/icons/khangman.xpm
index 18251829d..18251829d 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/khangman.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/khangman.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kig.xpm b/ubuntu/_base/tdeedu/debian/icons/kig.xpm
index e518e618a..e518e618a 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kig.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kig.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kiten.xpm b/ubuntu/_base/tdeedu/debian/icons/kiten.xpm
index 92101a430..92101a430 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kiten.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kiten.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/klatin.xpm b/ubuntu/_base/tdeedu/debian/icons/klatin.xpm
index 1e8cccf38..1e8cccf38 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/klatin.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/klatin.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/klettres.xpm b/ubuntu/_base/tdeedu/debian/icons/klettres.xpm
index be4851eee..be4851eee 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/klettres.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/klettres.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kmplot.xpm b/ubuntu/_base/tdeedu/debian/icons/kmplot.xpm
index a37fbc778..a37fbc778 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kmplot.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kmplot.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kpercentage.xpm b/ubuntu/_base/tdeedu/debian/icons/kpercentage.xpm
index 4f4b77fd2..4f4b77fd2 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kpercentage.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kpercentage.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kstars.xpm b/ubuntu/_base/tdeedu/debian/icons/kstars.xpm
index d7c0c52db..d7c0c52db 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kstars.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kstars.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/ktouch.xpm b/ubuntu/_base/tdeedu/debian/icons/ktouch.xpm
index 93378760a..93378760a 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/ktouch.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/ktouch.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kturtle.xpm b/ubuntu/_base/tdeedu/debian/icons/kturtle.xpm
index ebde8cd2d..ebde8cd2d 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kturtle.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kturtle.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kverbos.xpm b/ubuntu/_base/tdeedu/debian/icons/kverbos.xpm
index 2a3e33969..2a3e33969 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kverbos.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kverbos.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kvoctrain.xpm b/ubuntu/_base/tdeedu/debian/icons/kvoctrain.xpm
index bb2421754..bb2421754 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kvoctrain.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kvoctrain.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/icons/kwordquiz.xpm b/ubuntu/_base/tdeedu/debian/icons/kwordquiz.xpm
index 7d855ed5e..7d855ed5e 100644
--- a/ubuntu/maverick/tdeedu/debian/icons/kwordquiz.xpm
+++ b/ubuntu/_base/tdeedu/debian/icons/kwordquiz.xpm
diff --git a/ubuntu/maverick/tdeedu/debian/indi-trinity.docs b/ubuntu/_base/tdeedu/debian/indi-trinity.docs
index 352a6403d..352a6403d 100644
--- a/ubuntu/maverick/tdeedu/debian/indi-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/indi-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/indi-trinity.install b/ubuntu/_base/tdeedu/debian/indi-trinity.install
index 82db36a4a..82db36a4a 100644
--- a/ubuntu/maverick/tdeedu/debian/indi-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/indi-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/indi-trinity.install.kfreebsd-i386 b/ubuntu/_base/tdeedu/debian/indi-trinity.install.kfreebsd-i386
index 40860ff1a..40860ff1a 100644
--- a/ubuntu/maverick/tdeedu/debian/indi-trinity.install.kfreebsd-i386
+++ b/ubuntu/_base/tdeedu/debian/indi-trinity.install.kfreebsd-i386
diff --git a/ubuntu/maverick/tdeedu/debian/indi-trinity.manpages b/ubuntu/_base/tdeedu/debian/indi-trinity.manpages
index 1c974f253..1c974f253 100644
--- a/ubuntu/maverick/tdeedu/debian/indi-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/indi-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kalzium-data-trinity.install b/ubuntu/_base/tdeedu/debian/kalzium-data-trinity.install
index 05ae14025..05ae14025 100644
--- a/ubuntu/maverick/tdeedu/debian/kalzium-data-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kalzium-data-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kalzium-trinity.README.Debian
index 57b0b7c6a..57b0b7c6a 100644
--- a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kalzium-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.docs b/ubuntu/_base/tdeedu/debian/kalzium-trinity.docs
index d4bedeb0c..d4bedeb0c 100644
--- a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kalzium-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.install b/ubuntu/_base/tdeedu/debian/kalzium-trinity.install
index be9e9bd4d..be9e9bd4d 100644
--- a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kalzium-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.manpages b/ubuntu/_base/tdeedu/debian/kalzium-trinity.manpages
index 2ac62d8e2..2ac62d8e2 100644
--- a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kalzium-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.menu b/ubuntu/_base/tdeedu/debian/kalzium-trinity.menu
index 7deabbbc8..7deabbbc8 100644
--- a/ubuntu/maverick/tdeedu/debian/kalzium-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kalzium-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kanagram-trinity.README.Debian
index 77691b8ff..77691b8ff 100644
--- a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kanagram-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.docs b/ubuntu/_base/tdeedu/debian/kanagram-trinity.docs
index 1557c8035..1557c8035 100644
--- a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kanagram-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.install b/ubuntu/_base/tdeedu/debian/kanagram-trinity.install
index 747d64a84..747d64a84 100644
--- a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kanagram-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.manpages b/ubuntu/_base/tdeedu/debian/kanagram-trinity.manpages
index bf36c99a5..bf36c99a5 100644
--- a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kanagram-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.menu b/ubuntu/_base/tdeedu/debian/kanagram-trinity.menu
index 60412d1ce..60412d1ce 100644
--- a/ubuntu/maverick/tdeedu/debian/kanagram-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kanagram-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kbruch-trinity.README.Debian
index 7d56d7d39..7d56d7d39 100644
--- a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kbruch-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.docs b/ubuntu/_base/tdeedu/debian/kbruch-trinity.docs
index 336e1abbb..336e1abbb 100644
--- a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kbruch-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.install b/ubuntu/_base/tdeedu/debian/kbruch-trinity.install
index 6b4f60d97..6b4f60d97 100644
--- a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kbruch-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.manpages b/ubuntu/_base/tdeedu/debian/kbruch-trinity.manpages
index 622f534e2..622f534e2 100644
--- a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kbruch-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.menu b/ubuntu/_base/tdeedu/debian/kbruch-trinity.menu
index d0050f91a..d0050f91a 100644
--- a/ubuntu/maverick/tdeedu/debian/kbruch-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kbruch-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/keduca-shrinker b/ubuntu/_base/tdeedu/debian/keduca-shrinker
index 188b3e0ef..188b3e0ef 100644
--- a/ubuntu/maverick/tdeedu/debian/keduca-shrinker
+++ b/ubuntu/_base/tdeedu/debian/keduca-shrinker
diff --git a/ubuntu/maverick/tdeedu/debian/keduca-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/keduca-trinity.README.Debian
index 3932ea2fb..3932ea2fb 100644
--- a/ubuntu/maverick/tdeedu/debian/keduca-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/keduca-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/keduca-trinity.docs b/ubuntu/_base/tdeedu/debian/keduca-trinity.docs
index 7741881ce..7741881ce 100644
--- a/ubuntu/maverick/tdeedu/debian/keduca-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/keduca-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/keduca-trinity.install b/ubuntu/_base/tdeedu/debian/keduca-trinity.install
index c4ea76970..c4ea76970 100644
--- a/ubuntu/maverick/tdeedu/debian/keduca-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/keduca-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/keduca-trinity.manpages b/ubuntu/_base/tdeedu/debian/keduca-trinity.manpages
index 99bab9f63..99bab9f63 100644
--- a/ubuntu/maverick/tdeedu/debian/keduca-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/keduca-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/keduca-trinity.menu b/ubuntu/_base/tdeedu/debian/keduca-trinity.menu
index 450fc5f86..450fc5f86 100644
--- a/ubuntu/maverick/tdeedu/debian/keduca-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/keduca-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kgeography-data-trinity.install b/ubuntu/_base/tdeedu/debian/kgeography-data-trinity.install
index 9fbb1a151..9fbb1a151 100644
--- a/ubuntu/maverick/tdeedu/debian/kgeography-data-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kgeography-data-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kgeography-trinity.README.Debian
index e0b5ac9b8..e0b5ac9b8 100644
--- a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kgeography-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.docs b/ubuntu/_base/tdeedu/debian/kgeography-trinity.docs
index aebb229cb..aebb229cb 100644
--- a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kgeography-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.install b/ubuntu/_base/tdeedu/debian/kgeography-trinity.install
index 97ceb7fb2..97ceb7fb2 100644
--- a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kgeography-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.manpages b/ubuntu/_base/tdeedu/debian/kgeography-trinity.manpages
index 390e2bed2..390e2bed2 100644
--- a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kgeography-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.menu b/ubuntu/_base/tdeedu/debian/kgeography-trinity.menu
index 9cb6374a5..9cb6374a5 100644
--- a/ubuntu/maverick/tdeedu/debian/kgeography-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kgeography-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/khangman-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/khangman-trinity.README.Debian
index b46348693..b46348693 100644
--- a/ubuntu/maverick/tdeedu/debian/khangman-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/khangman-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/khangman-trinity.docs b/ubuntu/_base/tdeedu/debian/khangman-trinity.docs
index af4ab50be..af4ab50be 100644
--- a/ubuntu/maverick/tdeedu/debian/khangman-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/khangman-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/khangman-trinity.install b/ubuntu/_base/tdeedu/debian/khangman-trinity.install
index bd61f0f6d..bd61f0f6d 100644
--- a/ubuntu/maverick/tdeedu/debian/khangman-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/khangman-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/khangman-trinity.manpages b/ubuntu/_base/tdeedu/debian/khangman-trinity.manpages
index b49d3e8fd..b49d3e8fd 100644
--- a/ubuntu/maverick/tdeedu/debian/khangman-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/khangman-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/khangman-trinity.menu b/ubuntu/_base/tdeedu/debian/khangman-trinity.menu
index 033963128..033963128 100644
--- a/ubuntu/maverick/tdeedu/debian/khangman-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/khangman-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kig-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kig-trinity.README.Debian
index 21d766153..21d766153 100644
--- a/ubuntu/maverick/tdeedu/debian/kig-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kig-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kig-trinity.docs b/ubuntu/_base/tdeedu/debian/kig-trinity.docs
index 940a47920..940a47920 100644
--- a/ubuntu/maverick/tdeedu/debian/kig-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kig-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kig-trinity.install b/ubuntu/_base/tdeedu/debian/kig-trinity.install
index 4a76ad271..4a76ad271 100644
--- a/ubuntu/maverick/tdeedu/debian/kig-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kig-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kig-trinity.manpages b/ubuntu/_base/tdeedu/debian/kig-trinity.manpages
index 9d8d993a9..9d8d993a9 100644
--- a/ubuntu/maverick/tdeedu/debian/kig-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kig-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kig-trinity.menu b/ubuntu/_base/tdeedu/debian/kig-trinity.menu
index bd8c7e241..bd8c7e241 100644
--- a/ubuntu/maverick/tdeedu/debian/kig-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kig-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kiten-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kiten-trinity.README.Debian
index 3b0d66768..3b0d66768 100644
--- a/ubuntu/maverick/tdeedu/debian/kiten-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kiten-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kiten-trinity.docs b/ubuntu/_base/tdeedu/debian/kiten-trinity.docs
index 3c9f2f3bf..3c9f2f3bf 100644
--- a/ubuntu/maverick/tdeedu/debian/kiten-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kiten-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kiten-trinity.install b/ubuntu/_base/tdeedu/debian/kiten-trinity.install
index 040a3cade..040a3cade 100644
--- a/ubuntu/maverick/tdeedu/debian/kiten-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kiten-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kiten-trinity.manpages b/ubuntu/_base/tdeedu/debian/kiten-trinity.manpages
index 1fd7ca049..1fd7ca049 100644
--- a/ubuntu/maverick/tdeedu/debian/kiten-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kiten-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kiten-trinity.menu b/ubuntu/_base/tdeedu/debian/kiten-trinity.menu
index 72d6a1251..72d6a1251 100644
--- a/ubuntu/maverick/tdeedu/debian/kiten-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kiten-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/klatin-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/klatin-trinity.README.Debian
index eb2f5e329..eb2f5e329 100644
--- a/ubuntu/maverick/tdeedu/debian/klatin-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/klatin-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/klatin-trinity.docs b/ubuntu/_base/tdeedu/debian/klatin-trinity.docs
index 22306e756..22306e756 100644
--- a/ubuntu/maverick/tdeedu/debian/klatin-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/klatin-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/klatin-trinity.install b/ubuntu/_base/tdeedu/debian/klatin-trinity.install
index 1ef736d07..1ef736d07 100644
--- a/ubuntu/maverick/tdeedu/debian/klatin-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/klatin-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/klatin-trinity.manpages b/ubuntu/_base/tdeedu/debian/klatin-trinity.manpages
index 72c7f2719..72c7f2719 100644
--- a/ubuntu/maverick/tdeedu/debian/klatin-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/klatin-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/klatin-trinity.menu b/ubuntu/_base/tdeedu/debian/klatin-trinity.menu
index 6a27f0e9e..6a27f0e9e 100644
--- a/ubuntu/maverick/tdeedu/debian/klatin-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/klatin-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/klettres-data-trinity.README.Debian
index 6e0ac76cc..6e0ac76cc 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/klettres-data-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.docs b/ubuntu/_base/tdeedu/debian/klettres-data-trinity.docs
index 865db67c0..865db67c0 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/klettres-data-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.install b/ubuntu/_base/tdeedu/debian/klettres-data-trinity.install
index fa8533f0e..fa8533f0e 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-data-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/klettres-data-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/klettres-trinity.README.Debian
index 74b1c2de0..74b1c2de0 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/klettres-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-trinity.docs b/ubuntu/_base/tdeedu/debian/klettres-trinity.docs
index 865db67c0..865db67c0 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/klettres-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-trinity.install b/ubuntu/_base/tdeedu/debian/klettres-trinity.install
index 0d55cbb84..0d55cbb84 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/klettres-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-trinity.manpages b/ubuntu/_base/tdeedu/debian/klettres-trinity.manpages
index 769e1a35e..769e1a35e 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/klettres-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/klettres-trinity.menu b/ubuntu/_base/tdeedu/debian/klettres-trinity.menu
index 0db4a8d0b..0db4a8d0b 100644
--- a/ubuntu/maverick/tdeedu/debian/klettres-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/klettres-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kmplot-trinity.README.Debian
index b1d49586d..b1d49586d 100644
--- a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kmplot-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.docs b/ubuntu/_base/tdeedu/debian/kmplot-trinity.docs
index f4e45eafe..f4e45eafe 100644
--- a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kmplot-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.install b/ubuntu/_base/tdeedu/debian/kmplot-trinity.install
index 496ba1a4a..496ba1a4a 100644
--- a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kmplot-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.manpages b/ubuntu/_base/tdeedu/debian/kmplot-trinity.manpages
index 347f3c24b..347f3c24b 100644
--- a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kmplot-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.menu b/ubuntu/_base/tdeedu/debian/kmplot-trinity.menu
index 755a6f7ba..755a6f7ba 100644
--- a/ubuntu/maverick/tdeedu/debian/kmplot-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kmplot-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.README.Debian
index f99cbba30..f99cbba30 100644
--- a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.docs b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.docs
index 33cdf33c0..33cdf33c0 100644
--- a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.install b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.install
index b92df18bf..b92df18bf 100644
--- a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.manpages b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.manpages
index a08d7f942..a08d7f942 100644
--- a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.menu b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.menu
index 1ca8947e9..1ca8947e9 100644
--- a/ubuntu/maverick/tdeedu/debian/kpercentage-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kstars-data-trinity.README.Debian
index 7032707b2..7032707b2 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kstars-data-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.docs b/ubuntu/_base/tdeedu/debian/kstars-data-trinity.docs
index 1666af4b8..1666af4b8 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kstars-data-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.install b/ubuntu/_base/tdeedu/debian/kstars-data-trinity.install
index 5ccd88f52..5ccd88f52 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-data-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kstars-data-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kstars-trinity.README.Debian
index adba4b1a6..adba4b1a6 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kstars-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-trinity.docs b/ubuntu/_base/tdeedu/debian/kstars-trinity.docs
index 1666af4b8..1666af4b8 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kstars-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-trinity.install b/ubuntu/_base/tdeedu/debian/kstars-trinity.install
index 81b344151..81b344151 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kstars-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-trinity.manpages b/ubuntu/_base/tdeedu/debian/kstars-trinity.manpages
index e780d23cc..e780d23cc 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kstars-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kstars-trinity.menu b/ubuntu/_base/tdeedu/debian/kstars-trinity.menu
index 0074c7e93..0074c7e93 100644
--- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kstars-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/ktouch-trinity.README.Debian
index 1b538edbd..1b538edbd 100644
--- a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/ktouch-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.docs b/ubuntu/_base/tdeedu/debian/ktouch-trinity.docs
index f62a18074..f62a18074 100644
--- a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/ktouch-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.install b/ubuntu/_base/tdeedu/debian/ktouch-trinity.install
index 38be25793..38be25793 100644
--- a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/ktouch-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.manpages b/ubuntu/_base/tdeedu/debian/ktouch-trinity.manpages
index 3c91278db..3c91278db 100644
--- a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/ktouch-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.menu b/ubuntu/_base/tdeedu/debian/ktouch-trinity.menu
index f0bb0f189..f0bb0f189 100644
--- a/ubuntu/maverick/tdeedu/debian/ktouch-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/ktouch-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kturtle-trinity.README.Debian
index 3ad3006b0..3ad3006b0 100644
--- a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kturtle-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.docs b/ubuntu/_base/tdeedu/debian/kturtle-trinity.docs
index b66109b8a..b66109b8a 100644
--- a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kturtle-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.install b/ubuntu/_base/tdeedu/debian/kturtle-trinity.install
index 396fae124..396fae124 100644
--- a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kturtle-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.manpages b/ubuntu/_base/tdeedu/debian/kturtle-trinity.manpages
index f0a3e17d8..f0a3e17d8 100644
--- a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kturtle-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.menu b/ubuntu/_base/tdeedu/debian/kturtle-trinity.menu
index c3fef1da9..c3fef1da9 100644
--- a/ubuntu/maverick/tdeedu/debian/kturtle-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kturtle-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kverbos-trinity.README.Debian
index c2b55dc43..c2b55dc43 100644
--- a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kverbos-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.docs b/ubuntu/_base/tdeedu/debian/kverbos-trinity.docs
index 52c3fa74e..52c3fa74e 100644
--- a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kverbos-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.install b/ubuntu/_base/tdeedu/debian/kverbos-trinity.install
index 553844a03..553844a03 100644
--- a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kverbos-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.manpages b/ubuntu/_base/tdeedu/debian/kverbos-trinity.manpages
index d47a4e1b1..d47a4e1b1 100644
--- a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kverbos-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.menu b/ubuntu/_base/tdeedu/debian/kverbos-trinity.menu
index 27077e1ce..27077e1ce 100644
--- a/ubuntu/maverick/tdeedu/debian/kverbos-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kverbos-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.README.Debian
index 851bab339..851bab339 100644
--- a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.docs b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.docs
index 4a4aa3f2d..4a4aa3f2d 100644
--- a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.install b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.install
index 9e2031c86..9e2031c86 100644
--- a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.manpages b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.manpages
index c02c3041f..c02c3041f 100644
--- a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.menu b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.menu
index f301a8d3a..f301a8d3a 100644
--- a/ubuntu/maverick/tdeedu/debian/kvoctrain-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.README.Debian
index 3e4de808f..3e4de808f 100644
--- a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.docs b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.docs
index 124d517c7..124d517c7 100644
--- a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.install b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.install
index 5db76116f..5db76116f 100644
--- a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.manpages b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.manpages
index 1f4715f49..1f4715f49 100644
--- a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.menu b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.menu
index ba420f327..ba420f327 100644
--- a/ubuntu/maverick/tdeedu/debian/kwordquiz-trinity.menu
+++ b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.menu
diff --git a/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install b/ubuntu/_base/tdeedu/debian/libkiten-dev-trinity.install
index e64535480..e64535480 100644
--- a/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/libkiten-dev-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/libkiten1-trinity.install b/ubuntu/_base/tdeedu/debian/libkiten1-trinity.install
index 1d3ae5e00..1d3ae5e00 100644
--- a/ubuntu/maverick/tdeedu/debian/libkiten1-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/libkiten1-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/libkiten1-trinity.links b/ubuntu/_base/tdeedu/debian/libkiten1-trinity.links
index 0663edfd3..0663edfd3 100644
--- a/ubuntu/maverick/tdeedu/debian/libkiten1-trinity.links
+++ b/ubuntu/_base/tdeedu/debian/libkiten1-trinity.links
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.docs b/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.docs
index 81fca1df6..81fca1df6 100644
--- a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install b/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.install
index 1695e3cf1..1695e3cf1 100644
--- a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.manpages b/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.manpages
index b1292516f..b1292516f 100644
--- a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.manpages
+++ b/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.manpages
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.docs b/ubuntu/_base/tdeedu/debian/libtdeedu3-trinity.docs
index 81fca1df6..81fca1df6 100644
--- a/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.docs
+++ b/ubuntu/_base/tdeedu/debian/libtdeedu3-trinity.docs
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.install b/ubuntu/_base/tdeedu/debian/libtdeedu3-trinity.install
index 0d3dced21..0d3dced21 100644
--- a/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/libtdeedu3-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.override b/ubuntu/_base/tdeedu/debian/libtdeedu3-trinity.override
index 0c60daec8..0c60daec8 100644
--- a/ubuntu/maverick/tdeedu/debian/libtdeedu3-trinity.override
+++ b/ubuntu/_base/tdeedu/debian/libtdeedu3-trinity.override
diff --git a/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1 b/ubuntu/_base/tdeedu/debian/man/blinken-trinity.1
index 745feac0d..745feac0d 100644
--- a/ubuntu/maverick/tdeedu/debian/man/blinken-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/blinken-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1 b/ubuntu/_base/tdeedu/debian/man/celestrongps-trinity.1
index 45adf8fdc..45adf8fdc 100644
--- a/ubuntu/maverick/tdeedu/debian/man/celestrongps-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/celestrongps-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1 b/ubuntu/_base/tdeedu/debian/man/fliccd-trinity.1
index 3a0a73c0b..3a0a73c0b 100644
--- a/ubuntu/maverick/tdeedu/debian/man/fliccd-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/fliccd-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1 b/ubuntu/_base/tdeedu/debian/man/indiserver-trinity.1
index d11ee6dc9..d11ee6dc9 100644
--- a/ubuntu/maverick/tdeedu/debian/man/indiserver-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/indiserver-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kalzium-trinity.1
index b01903f10..b01903f10 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kalzium-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kalzium-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kanagram-trinity.1
index 0955cd6d8..0955cd6d8 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kanagram-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kanagram-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kbruch-trinity.1
index 68655e82e..68655e82e 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kbruch-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kbruch-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/keduca-shrinker-trinity.1 b/ubuntu/_base/tdeedu/debian/man/keduca-shrinker-trinity.1
index 57de28410..57de28410 100644
--- a/ubuntu/maverick/tdeedu/debian/man/keduca-shrinker-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/keduca-shrinker-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1 b/ubuntu/_base/tdeedu/debian/man/keduca-trinity.1
index 634977aa1..634977aa1 100644
--- a/ubuntu/maverick/tdeedu/debian/man/keduca-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/keduca-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1 b/ubuntu/_base/tdeedu/debian/man/keducabuilder-trinity.1
index a6431a28d..a6431a28d 100644
--- a/ubuntu/maverick/tdeedu/debian/man/keducabuilder-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/keducabuilder-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kgeography-trinity.1
index 451605d93..451605d93 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kgeography-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kgeography-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1 b/ubuntu/_base/tdeedu/debian/man/khangman-trinity.1
index b130aa3ca..b130aa3ca 100644
--- a/ubuntu/maverick/tdeedu/debian/man/khangman-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/khangman-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kig-trinity.1
index 208ed9165..208ed9165 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kig-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kig-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kiten-trinity.1
index 8ae3bd3ed..8ae3bd3ed 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kiten-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kiten-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kitengen-trinity.1
index 12b27ee11..12b27ee11 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kitengen-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kitengen-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1 b/ubuntu/_base/tdeedu/debian/man/klatin-trinity.1
index 35c59e219..35c59e219 100644
--- a/ubuntu/maverick/tdeedu/debian/man/klatin-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/klatin-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1 b/ubuntu/_base/tdeedu/debian/man/klettres-trinity.1
index 6f6a3177d..6f6a3177d 100644
--- a/ubuntu/maverick/tdeedu/debian/man/klettres-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/klettres-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kmplot-trinity.1
index aa8e4cb50..aa8e4cb50 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kmplot-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kpercentage-trinity.1
index 26aceb232..26aceb232 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kpercentage-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kpercentage-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kstars-trinity.1
index d6cce79bf..d6cce79bf 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kstars-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kstars-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1 b/ubuntu/_base/tdeedu/debian/man/ktouch-trinity.1
index 4738c6a8c..4738c6a8c 100644
--- a/ubuntu/maverick/tdeedu/debian/man/ktouch-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/ktouch-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kturtle-trinity.1
index 756e2c62d..756e2c62d 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kturtle-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kturtle-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kverbos-trinity.1
index a78e0dec1..a78e0dec1 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kverbos-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kverbos-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kvoctrain-trinity.1
index 50b8bd39f..50b8bd39f 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kvoctrain-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kvoctrain-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kwordquiz-trinity.1
index 538db52fa..538db52fa 100644
--- a/ubuntu/maverick/tdeedu/debian/man/kwordquiz-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/kwordquiz-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/langen2kvtml-trinity.1 b/ubuntu/_base/tdeedu/debian/man/langen2kvtml-trinity.1
index 226baef49..226baef49 100644
--- a/ubuntu/maverick/tdeedu/debian/man/langen2kvtml-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/langen2kvtml-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1 b/ubuntu/_base/tdeedu/debian/man/lx200_16-trinity.1
index d169ebf17..d169ebf17 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200_16-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/lx200_16-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1 b/ubuntu/_base/tdeedu/debian/man/lx200autostar-trinity.1
index b13bbffe3..b13bbffe3 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200autostar-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/lx200autostar-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1 b/ubuntu/_base/tdeedu/debian/man/lx200classic-trinity.1
index a37527a85..a37527a85 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200classic-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/lx200classic-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1 b/ubuntu/_base/tdeedu/debian/man/lx200generic-trinity.1
index b37ccfee9..b37ccfee9 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200generic-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/lx200generic-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1 b/ubuntu/_base/tdeedu/debian/man/lx200gps-trinity.1
index ea0d2fc82..ea0d2fc82 100644
--- a/ubuntu/maverick/tdeedu/debian/man/lx200gps-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/lx200gps-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/spotlight2kvtml-trinity.1 b/ubuntu/_base/tdeedu/debian/man/spotlight2kvtml-trinity.1
index eaff0a1aa..eaff0a1aa 100644
--- a/ubuntu/maverick/tdeedu/debian/man/spotlight2kvtml-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/spotlight2kvtml-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1 b/ubuntu/_base/tdeedu/debian/man/temma-trinity.1
index 46b9e4eaa..46b9e4eaa 100644
--- a/ubuntu/maverick/tdeedu/debian/man/temma-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/temma-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/test_extdate-trinity.1 b/ubuntu/_base/tdeedu/debian/man/test_extdate-trinity.1
index 90bd63d89..90bd63d89 100644
--- a/ubuntu/maverick/tdeedu/debian/man/test_extdate-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/test_extdate-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/test_extdatepicker-trinity.1 b/ubuntu/_base/tdeedu/debian/man/test_extdatepicker-trinity.1
index 9a25504f0..9a25504f0 100644
--- a/ubuntu/maverick/tdeedu/debian/man/test_extdatepicker-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/test_extdatepicker-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1 b/ubuntu/_base/tdeedu/debian/man/v4ldriver-trinity.1
index 9220a16bb..9220a16bb 100644
--- a/ubuntu/maverick/tdeedu/debian/man/v4ldriver-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/v4ldriver-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1 b/ubuntu/_base/tdeedu/debian/man/v4lphilips-trinity.1
index 1553652d6..1553652d6 100644
--- a/ubuntu/maverick/tdeedu/debian/man/v4lphilips-trinity.1
+++ b/ubuntu/_base/tdeedu/debian/man/v4lphilips-trinity.1
diff --git a/ubuntu/maverick/tdeedu/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdeedu/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdeedu/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdeedu/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdeedu/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdeedu/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdeedu/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdeedu/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdeedu/debian/patches/series b/ubuntu/_base/tdeedu/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdeedu/debian/patches/series
+++ b/ubuntu/_base/tdeedu/debian/patches/series
diff --git a/ubuntu/maverick/tdeedu/debian/rules b/ubuntu/_base/tdeedu/debian/rules
index e141e830c..e141e830c 100755
--- a/ubuntu/maverick/tdeedu/debian/rules
+++ b/ubuntu/_base/tdeedu/debian/rules
diff --git a/ubuntu/maverick/tdeedu/debian/source/format b/ubuntu/_base/tdeedu/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdeedu/debian/source/format
+++ b/ubuntu/_base/tdeedu/debian/source/format
diff --git a/ubuntu/maverick/tdeedu/debian/source/options b/ubuntu/_base/tdeedu/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdeedu/debian/source/options
+++ b/ubuntu/_base/tdeedu/debian/source/options
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-data-trinity.install b/ubuntu/_base/tdeedu/debian/tdeedu-data-trinity.install
index 021e2b38d..021e2b38d 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-data-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-data-trinity.install
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.blinken b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
index 4ff6e8f6b..4ff6e8f6b 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.blinken
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
index 41475e0ee..41475e0ee 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kalzium
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
index 117156815..117156815 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kbruch
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.keduca b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
index 810f29b8c..810f29b8c 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.keduca
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
index 494fbe50c..494fbe50c 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kgeography
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.khangman b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
index b5ac77cce..b5ac77cce 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.khangman
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kig b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kig
index 60534932f..60534932f 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kig
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kig
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kiten b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
index a89809268..a89809268 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kiten
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klatin b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
index b1cbf83d1..b1cbf83d1 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.klatin
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klettres b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
index 9c3595aad..9c3595aad 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.klettres
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
index 8a1191e91..8a1191e91 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kmplot
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
index 2c172778c..2c172778c 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kpercentage
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kstars b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
index af1fe31ac..af1fe31ac 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kstars
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
index a7815e054..a7815e054 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.ktouch
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
index 3104fe43e..3104fe43e 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kturtle
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
index 6a1dd3d86..6a1dd3d86 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kverbos
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
index a789694b6..a789694b6 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kvoctrain
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
index 15047425c..15047425c 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-doc-html.doc-base.kwordquiz
diff --git a/ubuntu/maverick/tdeedu/debian/tdeedu-trinity.README.Debian b/ubuntu/_base/tdeedu/debian/tdeedu-trinity.README.Debian
index d3523892f..d3523892f 100644
--- a/ubuntu/maverick/tdeedu/debian/tdeedu-trinity.README.Debian
+++ b/ubuntu/_base/tdeedu/debian/tdeedu-trinity.README.Debian
diff --git a/ubuntu/maverick/tdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 80da007ae..80da007ae 100644
--- a/ubuntu/maverick/tdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install b/ubuntu/_base/tdegames/debian/atlantik-trinity-dev.install
index 2dee85dd3..2dee85dd3 100644
--- a/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install
+++ b/ubuntu/_base/tdegames/debian/atlantik-trinity-dev.install
diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity.install b/ubuntu/_base/tdegames/debian/atlantik-trinity.install
index 69d8dbc9a..69d8dbc9a 100644
--- a/ubuntu/maverick/tdegames/debian/atlantik-trinity.install
+++ b/ubuntu/_base/tdegames/debian/atlantik-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity.links b/ubuntu/_base/tdegames/debian/atlantik-trinity.links
index b368efade..b368efade 100644
--- a/ubuntu/maverick/tdegames/debian/atlantik-trinity.links
+++ b/ubuntu/_base/tdegames/debian/atlantik-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity.manpages b/ubuntu/_base/tdegames/debian/atlantik-trinity.manpages
index ba9602ad7..ba9602ad7 100644
--- a/ubuntu/maverick/tdegames/debian/atlantik-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/atlantik-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity.menu b/ubuntu/_base/tdegames/debian/atlantik-trinity.menu
index c0604c83c..c0604c83c 100644
--- a/ubuntu/maverick/tdegames/debian/atlantik-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/atlantik-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdegames/debian/cdbs/debian-qt-kde.mk
index 14dce59aa..14dce59aa 100644
--- a/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdegames/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk b/ubuntu/_base/tdegames/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdegames/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdegames/debian/cdbs/versions.pl b/ubuntu/_base/tdegames/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdegames/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdegames/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdegames/debian/changelog b/ubuntu/_base/tdegames/debian/changelog
index 8b0897c5a..8b0897c5a 100644
--- a/ubuntu/maverick/tdegames/debian/changelog
+++ b/ubuntu/_base/tdegames/debian/changelog
diff --git a/ubuntu/maverick/tdegames/debian/compat b/ubuntu/_base/tdegames/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdegames/debian/compat
+++ b/ubuntu/_base/tdegames/debian/compat
diff --git a/ubuntu/maverick/tdegames/debian/control b/ubuntu/_base/tdegames/debian/control
index 1ed52e0f4..1ed52e0f4 100644
--- a/ubuntu/maverick/tdegames/debian/control
+++ b/ubuntu/_base/tdegames/debian/control
diff --git a/ubuntu/maverick/tdegames/debian/copyright b/ubuntu/_base/tdegames/debian/copyright
index 8e365dd48..8e365dd48 100644
--- a/ubuntu/maverick/tdegames/debian/copyright
+++ b/ubuntu/_base/tdegames/debian/copyright
diff --git a/ubuntu/maverick/tdegames/debian/icons/atlantik-16.xpm b/ubuntu/_base/tdegames/debian/icons/atlantik-16.xpm
index 611f1f97a..611f1f97a 100644
--- a/ubuntu/maverick/tdegames/debian/icons/atlantik-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/atlantik-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/atlantik.xpm b/ubuntu/_base/tdegames/debian/icons/atlantik.xpm
index bedcf6cc1..bedcf6cc1 100644
--- a/ubuntu/maverick/tdegames/debian/icons/atlantik.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/atlantik.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kasteroids-16.xpm b/ubuntu/_base/tdegames/debian/icons/kasteroids-16.xpm
index c15e3b0ee..c15e3b0ee 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kasteroids-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kasteroids-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kasteroids.xpm b/ubuntu/_base/tdegames/debian/icons/kasteroids.xpm
index f73c45dee..f73c45dee 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kasteroids.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kasteroids.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/katomic-16.xpm b/ubuntu/_base/tdegames/debian/icons/katomic-16.xpm
index 2d34f8adc..2d34f8adc 100644
--- a/ubuntu/maverick/tdegames/debian/icons/katomic-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/katomic-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/katomic.xpm b/ubuntu/_base/tdegames/debian/icons/katomic.xpm
index d8cca7cf5..d8cca7cf5 100644
--- a/ubuntu/maverick/tdegames/debian/icons/katomic.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/katomic.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kbackgammon-16.xpm b/ubuntu/_base/tdegames/debian/icons/kbackgammon-16.xpm
index 810a024dc..810a024dc 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kbackgammon-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kbackgammon-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kbackgammon.xpm b/ubuntu/_base/tdegames/debian/icons/kbackgammon.xpm
index 5cd453abb..5cd453abb 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kbackgammon.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kbackgammon.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kbattleship-16.xpm b/ubuntu/_base/tdegames/debian/icons/kbattleship-16.xpm
index 907010be4..907010be4 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kbattleship-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kbattleship-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kbattleship.xpm b/ubuntu/_base/tdegames/debian/icons/kbattleship.xpm
index 2dd29f5f2..2dd29f5f2 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kbattleship.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kbattleship.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kblackbox-16.xpm b/ubuntu/_base/tdegames/debian/icons/kblackbox-16.xpm
index 812f7db3d..812f7db3d 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kblackbox-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kblackbox-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kblackbox.xpm b/ubuntu/_base/tdegames/debian/icons/kblackbox.xpm
index 203307693..203307693 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kblackbox.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kblackbox.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kbounce-16.xpm b/ubuntu/_base/tdegames/debian/icons/kbounce-16.xpm
index 28c9599ec..28c9599ec 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kbounce-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kbounce-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kbounce.xpm b/ubuntu/_base/tdegames/debian/icons/kbounce.xpm
index e4afdecc7..e4afdecc7 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kbounce.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kbounce.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kenolaba-16.xpm b/ubuntu/_base/tdegames/debian/icons/kenolaba-16.xpm
index 413891e6f..413891e6f 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kenolaba-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kenolaba-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kenolaba.xpm b/ubuntu/_base/tdegames/debian/icons/kenolaba.xpm
index 84a592a58..84a592a58 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kenolaba.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kenolaba.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kfouleggs-16.xpm b/ubuntu/_base/tdegames/debian/icons/kfouleggs-16.xpm
index 2c94b7951..2c94b7951 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kfouleggs-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kfouleggs-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kfouleggs.xpm b/ubuntu/_base/tdegames/debian/icons/kfouleggs.xpm
index 2d4b0458d..2d4b0458d 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kfouleggs.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kfouleggs.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kgoldrunner-16.xpm b/ubuntu/_base/tdegames/debian/icons/kgoldrunner-16.xpm
index 16c4e1f92..16c4e1f92 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kgoldrunner-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kgoldrunner-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kgoldrunner.xpm b/ubuntu/_base/tdegames/debian/icons/kgoldrunner.xpm
index cba7cb4a2..cba7cb4a2 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kgoldrunner.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kgoldrunner.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kjumpingcube-16.xpm b/ubuntu/_base/tdegames/debian/icons/kjumpingcube-16.xpm
index 384b87ba1..384b87ba1 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kjumpingcube-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kjumpingcube-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kjumpingcube.xpm b/ubuntu/_base/tdegames/debian/icons/kjumpingcube.xpm
index 147c70579..147c70579 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kjumpingcube.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kjumpingcube.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/klickety-16.xpm b/ubuntu/_base/tdegames/debian/icons/klickety-16.xpm
index 8ab2f2cca..8ab2f2cca 100644
--- a/ubuntu/maverick/tdegames/debian/icons/klickety-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/klickety-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/klickety.xpm b/ubuntu/_base/tdegames/debian/icons/klickety.xpm
index 65929998d..65929998d 100644
--- a/ubuntu/maverick/tdegames/debian/icons/klickety.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/klickety.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/klines-16.xpm b/ubuntu/_base/tdegames/debian/icons/klines-16.xpm
index a8142f79a..a8142f79a 100644
--- a/ubuntu/maverick/tdegames/debian/icons/klines-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/klines-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/klines.xpm b/ubuntu/_base/tdegames/debian/icons/klines.xpm
index a25489ec7..a25489ec7 100644
--- a/ubuntu/maverick/tdegames/debian/icons/klines.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/klines.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kmahjongg-16.xpm b/ubuntu/_base/tdegames/debian/icons/kmahjongg-16.xpm
index 3c094c76e..3c094c76e 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kmahjongg-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kmahjongg-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kmahjongg.xpm b/ubuntu/_base/tdegames/debian/icons/kmahjongg.xpm
index 7fcd7db9b..7fcd7db9b 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kmahjongg.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kmahjongg.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kmines-16.xpm b/ubuntu/_base/tdegames/debian/icons/kmines-16.xpm
index a6f31a084..a6f31a084 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kmines-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kmines-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kmines.xpm b/ubuntu/_base/tdegames/debian/icons/kmines.xpm
index 39cbdf984..39cbdf984 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kmines.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kmines.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/knetwalk-16.xpm b/ubuntu/_base/tdegames/debian/icons/knetwalk-16.xpm
index f923a4ff3..f923a4ff3 100644
--- a/ubuntu/maverick/tdegames/debian/icons/knetwalk-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/knetwalk-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/knetwalk.xpm b/ubuntu/_base/tdegames/debian/icons/knetwalk.xpm
index e0aff6cc6..e0aff6cc6 100644
--- a/ubuntu/maverick/tdegames/debian/icons/knetwalk.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/knetwalk.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kolf-16.xpm b/ubuntu/_base/tdegames/debian/icons/kolf-16.xpm
index 94b1f4fc5..94b1f4fc5 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kolf-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kolf-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kolf.xpm b/ubuntu/_base/tdegames/debian/icons/kolf.xpm
index 329420de4..329420de4 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kolf.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kolf.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/konquest-16.xpm b/ubuntu/_base/tdegames/debian/icons/konquest-16.xpm
index b2e9e24e0..b2e9e24e0 100644
--- a/ubuntu/maverick/tdegames/debian/icons/konquest-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/konquest-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/konquest.xpm b/ubuntu/_base/tdegames/debian/icons/konquest.xpm
index 127f8d9f7..127f8d9f7 100644
--- a/ubuntu/maverick/tdegames/debian/icons/konquest.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/konquest.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kpat-16.xpm b/ubuntu/_base/tdegames/debian/icons/kpat-16.xpm
index 42d177db4..42d177db4 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kpat-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kpat-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kpat.xpm b/ubuntu/_base/tdegames/debian/icons/kpat.xpm
index 251453768..251453768 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kpat.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kpat.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kpoker-16.xpm b/ubuntu/_base/tdegames/debian/icons/kpoker-16.xpm
index 69e381b74..69e381b74 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kpoker-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kpoker-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kpoker.xpm b/ubuntu/_base/tdegames/debian/icons/kpoker.xpm
index dda5699a5..dda5699a5 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kpoker.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kpoker.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kreversi-16.xpm b/ubuntu/_base/tdegames/debian/icons/kreversi-16.xpm
index 47f24e1fd..47f24e1fd 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kreversi-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kreversi-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kreversi.xpm b/ubuntu/_base/tdegames/debian/icons/kreversi.xpm
index 01bb944e1..01bb944e1 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kreversi.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kreversi.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksame-16.xpm b/ubuntu/_base/tdegames/debian/icons/ksame-16.xpm
index 0981cde6d..0981cde6d 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksame-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksame-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksame.xpm b/ubuntu/_base/tdegames/debian/icons/ksame.xpm
index 9d899f425..9d899f425 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksame.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksame.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kshisen-16.xpm b/ubuntu/_base/tdegames/debian/icons/kshisen-16.xpm
index f9d1f3c3c..f9d1f3c3c 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kshisen-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kshisen-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kshisen.xpm b/ubuntu/_base/tdegames/debian/icons/kshisen.xpm
index 0e78d3b92..0e78d3b92 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kshisen.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kshisen.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksirtet-16.xpm b/ubuntu/_base/tdegames/debian/icons/ksirtet-16.xpm
index 8c5f2bf6a..8c5f2bf6a 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksirtet-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksirtet-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksirtet.xpm b/ubuntu/_base/tdegames/debian/icons/ksirtet.xpm
index 708a1f89e..708a1f89e 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksirtet.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksirtet.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksmiletris-16.xpm b/ubuntu/_base/tdegames/debian/icons/ksmiletris-16.xpm
index ce6fbe8a9..ce6fbe8a9 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksmiletris-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksmiletris-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksmiletris.xpm b/ubuntu/_base/tdegames/debian/icons/ksmiletris.xpm
index c7832aacd..c7832aacd 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksmiletris.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksmiletris.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksnake-16.xpm b/ubuntu/_base/tdegames/debian/icons/ksnake-16.xpm
index 409b95396..409b95396 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksnake-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksnake-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksnake.xpm b/ubuntu/_base/tdegames/debian/icons/ksnake.xpm
index 339e31d8a..339e31d8a 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksnake.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksnake.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksokoban-16.xpm b/ubuntu/_base/tdegames/debian/icons/ksokoban-16.xpm
index 0424d09f5..0424d09f5 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksokoban-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksokoban-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ksokoban.xpm b/ubuntu/_base/tdegames/debian/icons/ksokoban.xpm
index 6b9c52381..6b9c52381 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ksokoban.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ksokoban.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kspaceduel-16.xpm b/ubuntu/_base/tdegames/debian/icons/kspaceduel-16.xpm
index 911acb1cf..911acb1cf 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kspaceduel-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kspaceduel-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kspaceduel.xpm b/ubuntu/_base/tdegames/debian/icons/kspaceduel.xpm
index 0529f7ac5..0529f7ac5 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kspaceduel.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kspaceduel.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ktron-16.xpm b/ubuntu/_base/tdegames/debian/icons/ktron-16.xpm
index abaf26411..abaf26411 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ktron-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ktron-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ktron.xpm b/ubuntu/_base/tdegames/debian/icons/ktron.xpm
index 346a45d5e..346a45d5e 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ktron.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ktron.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ktuberling-16.xpm b/ubuntu/_base/tdegames/debian/icons/ktuberling-16.xpm
index 94ec16e57..94ec16e57 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ktuberling-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ktuberling-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/ktuberling.xpm b/ubuntu/_base/tdegames/debian/icons/ktuberling.xpm
index 8d3240633..8d3240633 100644
--- a/ubuntu/maverick/tdegames/debian/icons/ktuberling.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/ktuberling.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm b/ubuntu/_base/tdegames/debian/icons/kwin4-16.xpm
index fa15f0b8a..fa15f0b8a 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kwin4-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kwin4-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm b/ubuntu/_base/tdegames/debian/icons/kwin4.xpm
index 9d752d62e..9d752d62e 100644
--- a/ubuntu/maverick/tdegames/debian/icons/kwin4.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/kwin4.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/lskat-16.xpm b/ubuntu/_base/tdegames/debian/icons/lskat-16.xpm
index 8fb679d0e..8fb679d0e 100644
--- a/ubuntu/maverick/tdegames/debian/icons/lskat-16.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/lskat-16.xpm
diff --git a/ubuntu/maverick/tdegames/debian/icons/lskat.xpm b/ubuntu/_base/tdegames/debian/icons/lskat.xpm
index e24ed07ef..e24ed07ef 100644
--- a/ubuntu/maverick/tdegames/debian/icons/lskat.xpm
+++ b/ubuntu/_base/tdegames/debian/icons/lskat.xpm
diff --git a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.install b/ubuntu/_base/tdegames/debian/kasteroids-trinity.install
index 2d8ae246a..2d8ae246a 100644
--- a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kasteroids-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.links b/ubuntu/_base/tdegames/debian/kasteroids-trinity.links
index 5e93c0fe3..5e93c0fe3 100644
--- a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kasteroids-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.manpages b/ubuntu/_base/tdegames/debian/kasteroids-trinity.manpages
index 3155d6e18..3155d6e18 100644
--- a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kasteroids-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.menu b/ubuntu/_base/tdegames/debian/kasteroids-trinity.menu
index 5d7270340..5d7270340 100644
--- a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kasteroids-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/katomic-trinity.install b/ubuntu/_base/tdegames/debian/katomic-trinity.install
index 5db0c536c..5db0c536c 100644
--- a/ubuntu/maverick/tdegames/debian/katomic-trinity.install
+++ b/ubuntu/_base/tdegames/debian/katomic-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/katomic-trinity.links b/ubuntu/_base/tdegames/debian/katomic-trinity.links
index e254acaa5..e254acaa5 100644
--- a/ubuntu/maverick/tdegames/debian/katomic-trinity.links
+++ b/ubuntu/_base/tdegames/debian/katomic-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/katomic-trinity.manpages b/ubuntu/_base/tdegames/debian/katomic-trinity.manpages
index fb19d0803..fb19d0803 100644
--- a/ubuntu/maverick/tdegames/debian/katomic-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/katomic-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/katomic-trinity.menu b/ubuntu/_base/tdegames/debian/katomic-trinity.menu
index 4e6ce9848..4e6ce9848 100644
--- a/ubuntu/maverick/tdegames/debian/katomic-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/katomic-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.install b/ubuntu/_base/tdegames/debian/kbackgammon-trinity.install
index 3d84977d1..3d84977d1 100644
--- a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kbackgammon-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.links b/ubuntu/_base/tdegames/debian/kbackgammon-trinity.links
index 0aeb5b85c..0aeb5b85c 100644
--- a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kbackgammon-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.manpages b/ubuntu/_base/tdegames/debian/kbackgammon-trinity.manpages
index 62d51aced..62d51aced 100644
--- a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kbackgammon-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.menu b/ubuntu/_base/tdegames/debian/kbackgammon-trinity.menu
index f20b33f2a..f20b33f2a 100644
--- a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kbackgammon-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.install b/ubuntu/_base/tdegames/debian/kbattleship-trinity.install
index 94a76d5c9..94a76d5c9 100644
--- a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kbattleship-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.links b/ubuntu/_base/tdegames/debian/kbattleship-trinity.links
index 5db9ac11d..5db9ac11d 100644
--- a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kbattleship-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.manpages b/ubuntu/_base/tdegames/debian/kbattleship-trinity.manpages
index 87cb14840..87cb14840 100644
--- a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kbattleship-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.menu b/ubuntu/_base/tdegames/debian/kbattleship-trinity.menu
index dc7dbe67d..dc7dbe67d 100644
--- a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kbattleship-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.install b/ubuntu/_base/tdegames/debian/kblackbox-trinity.install
index ed4014be9..ed4014be9 100644
--- a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kblackbox-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.links b/ubuntu/_base/tdegames/debian/kblackbox-trinity.links
index 13ff89735..13ff89735 100644
--- a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kblackbox-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.manpages b/ubuntu/_base/tdegames/debian/kblackbox-trinity.manpages
index 768db9c03..768db9c03 100644
--- a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kblackbox-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.menu b/ubuntu/_base/tdegames/debian/kblackbox-trinity.menu
index 7ae4900cd..7ae4900cd 100644
--- a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kblackbox-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kbounce-trinity.install b/ubuntu/_base/tdegames/debian/kbounce-trinity.install
index ee1efab9c..ee1efab9c 100644
--- a/ubuntu/maverick/tdegames/debian/kbounce-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kbounce-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kbounce-trinity.links b/ubuntu/_base/tdegames/debian/kbounce-trinity.links
index 5e91fe04e..5e91fe04e 100644
--- a/ubuntu/maverick/tdegames/debian/kbounce-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kbounce-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kbounce-trinity.manpages b/ubuntu/_base/tdegames/debian/kbounce-trinity.manpages
index dd3a2fdfa..dd3a2fdfa 100644
--- a/ubuntu/maverick/tdegames/debian/kbounce-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kbounce-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kbounce-trinity.menu b/ubuntu/_base/tdegames/debian/kbounce-trinity.menu
index 2cb1992cf..2cb1992cf 100644
--- a/ubuntu/maverick/tdegames/debian/kbounce-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kbounce-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.install b/ubuntu/_base/tdegames/debian/kenolaba-trinity.install
index 060b18369..060b18369 100644
--- a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kenolaba-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.links b/ubuntu/_base/tdegames/debian/kenolaba-trinity.links
index 03980edc3..03980edc3 100644
--- a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kenolaba-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.manpages b/ubuntu/_base/tdegames/debian/kenolaba-trinity.manpages
index d39200c68..d39200c68 100644
--- a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kenolaba-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.menu b/ubuntu/_base/tdegames/debian/kenolaba-trinity.menu
index 9683e4507..9683e4507 100644
--- a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kenolaba-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.install b/ubuntu/_base/tdegames/debian/kfouleggs-trinity.install
index 3491175b8..3491175b8 100644
--- a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kfouleggs-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.links b/ubuntu/_base/tdegames/debian/kfouleggs-trinity.links
index 5d1835277..5d1835277 100644
--- a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kfouleggs-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.manpages b/ubuntu/_base/tdegames/debian/kfouleggs-trinity.manpages
index 033192e89..033192e89 100644
--- a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kfouleggs-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.menu b/ubuntu/_base/tdegames/debian/kfouleggs-trinity.menu
index fc14e57ab..fc14e57ab 100644
--- a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kfouleggs-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.install b/ubuntu/_base/tdegames/debian/kgoldrunner-trinity.install
index 871521852..871521852 100644
--- a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kgoldrunner-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.links b/ubuntu/_base/tdegames/debian/kgoldrunner-trinity.links
index 2a1164f25..2a1164f25 100644
--- a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kgoldrunner-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.manpages b/ubuntu/_base/tdegames/debian/kgoldrunner-trinity.manpages
index c352557d4..c352557d4 100644
--- a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kgoldrunner-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.menu b/ubuntu/_base/tdegames/debian/kgoldrunner-trinity.menu
index 7f14c2273..7f14c2273 100644
--- a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kgoldrunner-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.install b/ubuntu/_base/tdegames/debian/kjumpingcube-trinity.install
index c7395d68f..c7395d68f 100644
--- a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kjumpingcube-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.links b/ubuntu/_base/tdegames/debian/kjumpingcube-trinity.links
index 037ef6838..037ef6838 100644
--- a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kjumpingcube-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.manpages b/ubuntu/_base/tdegames/debian/kjumpingcube-trinity.manpages
index 3dcfe7015..3dcfe7015 100644
--- a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kjumpingcube-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.menu b/ubuntu/_base/tdegames/debian/kjumpingcube-trinity.menu
index 96b96fa2a..96b96fa2a 100644
--- a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kjumpingcube-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/klickety-trinity.install b/ubuntu/_base/tdegames/debian/klickety-trinity.install
index facefb860..facefb860 100644
--- a/ubuntu/maverick/tdegames/debian/klickety-trinity.install
+++ b/ubuntu/_base/tdegames/debian/klickety-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/klickety-trinity.links b/ubuntu/_base/tdegames/debian/klickety-trinity.links
index f281e2ba6..f281e2ba6 100644
--- a/ubuntu/maverick/tdegames/debian/klickety-trinity.links
+++ b/ubuntu/_base/tdegames/debian/klickety-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/klickety-trinity.manpages b/ubuntu/_base/tdegames/debian/klickety-trinity.manpages
index 5c003f445..5c003f445 100644
--- a/ubuntu/maverick/tdegames/debian/klickety-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/klickety-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/klickety-trinity.menu b/ubuntu/_base/tdegames/debian/klickety-trinity.menu
index d73ef3095..d73ef3095 100644
--- a/ubuntu/maverick/tdegames/debian/klickety-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/klickety-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/klines-trinity.install b/ubuntu/_base/tdegames/debian/klines-trinity.install
index 753271248..753271248 100644
--- a/ubuntu/maverick/tdegames/debian/klines-trinity.install
+++ b/ubuntu/_base/tdegames/debian/klines-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/klines-trinity.links b/ubuntu/_base/tdegames/debian/klines-trinity.links
index 2b00aeb3e..2b00aeb3e 100644
--- a/ubuntu/maverick/tdegames/debian/klines-trinity.links
+++ b/ubuntu/_base/tdegames/debian/klines-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/klines-trinity.manpages b/ubuntu/_base/tdegames/debian/klines-trinity.manpages
index 2a4381d37..2a4381d37 100644
--- a/ubuntu/maverick/tdegames/debian/klines-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/klines-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/klines-trinity.menu b/ubuntu/_base/tdegames/debian/klines-trinity.menu
index c4c78f80e..c4c78f80e 100644
--- a/ubuntu/maverick/tdegames/debian/klines-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/klines-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.install b/ubuntu/_base/tdegames/debian/kmahjongg-trinity.install
index 61a31a9ca..61a31a9ca 100644
--- a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kmahjongg-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.manpages b/ubuntu/_base/tdegames/debian/kmahjongg-trinity.manpages
index e951b29cc..e951b29cc 100644
--- a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kmahjongg-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.menu b/ubuntu/_base/tdegames/debian/kmahjongg-trinity.menu
index e64b26865..e64b26865 100644
--- a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kmahjongg-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kmines-trinity.install b/ubuntu/_base/tdegames/debian/kmines-trinity.install
index 2490e7a45..2490e7a45 100644
--- a/ubuntu/maverick/tdegames/debian/kmines-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kmines-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kmines-trinity.links b/ubuntu/_base/tdegames/debian/kmines-trinity.links
index d1d5a86fd..d1d5a86fd 100644
--- a/ubuntu/maverick/tdegames/debian/kmines-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kmines-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kmines-trinity.manpages b/ubuntu/_base/tdegames/debian/kmines-trinity.manpages
index f6100c64c..f6100c64c 100644
--- a/ubuntu/maverick/tdegames/debian/kmines-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kmines-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kmines-trinity.menu b/ubuntu/_base/tdegames/debian/kmines-trinity.menu
index b07cdbd2b..b07cdbd2b 100644
--- a/ubuntu/maverick/tdegames/debian/kmines-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kmines-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/knetwalk-trinity.install b/ubuntu/_base/tdegames/debian/knetwalk-trinity.install
index 4d1e7cddd..4d1e7cddd 100644
--- a/ubuntu/maverick/tdegames/debian/knetwalk-trinity.install
+++ b/ubuntu/_base/tdegames/debian/knetwalk-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/knetwalk-trinity.manpages b/ubuntu/_base/tdegames/debian/knetwalk-trinity.manpages
index e43789f1c..e43789f1c 100644
--- a/ubuntu/maverick/tdegames/debian/knetwalk-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/knetwalk-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/knetwalk-trinity.menu b/ubuntu/_base/tdegames/debian/knetwalk-trinity.menu
index 14b6fce7e..14b6fce7e 100644
--- a/ubuntu/maverick/tdegames/debian/knetwalk-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/knetwalk-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install b/ubuntu/_base/tdegames/debian/kolf-trinity-dev.install
index 601759f5b..601759f5b 100644
--- a/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install
+++ b/ubuntu/_base/tdegames/debian/kolf-trinity-dev.install
diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity.install b/ubuntu/_base/tdegames/debian/kolf-trinity.install
index 78b09e5a9..78b09e5a9 100644
--- a/ubuntu/maverick/tdegames/debian/kolf-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kolf-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity.links b/ubuntu/_base/tdegames/debian/kolf-trinity.links
index 8f0f830f5..8f0f830f5 100644
--- a/ubuntu/maverick/tdegames/debian/kolf-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kolf-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity.manpages b/ubuntu/_base/tdegames/debian/kolf-trinity.manpages
index ddc5af1a2..ddc5af1a2 100644
--- a/ubuntu/maverick/tdegames/debian/kolf-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kolf-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity.menu b/ubuntu/_base/tdegames/debian/kolf-trinity.menu
index 771819740..771819740 100644
--- a/ubuntu/maverick/tdegames/debian/kolf-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kolf-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/konquest-trinity.install b/ubuntu/_base/tdegames/debian/konquest-trinity.install
index 082787157..082787157 100644
--- a/ubuntu/maverick/tdegames/debian/konquest-trinity.install
+++ b/ubuntu/_base/tdegames/debian/konquest-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/konquest-trinity.links b/ubuntu/_base/tdegames/debian/konquest-trinity.links
index e57a10549..e57a10549 100644
--- a/ubuntu/maverick/tdegames/debian/konquest-trinity.links
+++ b/ubuntu/_base/tdegames/debian/konquest-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/konquest-trinity.manpages b/ubuntu/_base/tdegames/debian/konquest-trinity.manpages
index 75e03a8c5..75e03a8c5 100644
--- a/ubuntu/maverick/tdegames/debian/konquest-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/konquest-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/konquest-trinity.menu b/ubuntu/_base/tdegames/debian/konquest-trinity.menu
index 8130284e3..8130284e3 100644
--- a/ubuntu/maverick/tdegames/debian/konquest-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/konquest-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kpat-trinity.install b/ubuntu/_base/tdegames/debian/kpat-trinity.install
index 7fd5ff375..7fd5ff375 100644
--- a/ubuntu/maverick/tdegames/debian/kpat-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kpat-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kpat-trinity.links b/ubuntu/_base/tdegames/debian/kpat-trinity.links
index dbc291066..dbc291066 100644
--- a/ubuntu/maverick/tdegames/debian/kpat-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kpat-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kpat-trinity.manpages b/ubuntu/_base/tdegames/debian/kpat-trinity.manpages
index d1da72ae5..d1da72ae5 100644
--- a/ubuntu/maverick/tdegames/debian/kpat-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kpat-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kpat-trinity.menu b/ubuntu/_base/tdegames/debian/kpat-trinity.menu
index f68f53d68..f68f53d68 100644
--- a/ubuntu/maverick/tdegames/debian/kpat-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kpat-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kpoker-trinity.install b/ubuntu/_base/tdegames/debian/kpoker-trinity.install
index a7e22f616..a7e22f616 100644
--- a/ubuntu/maverick/tdegames/debian/kpoker-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kpoker-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kpoker-trinity.links b/ubuntu/_base/tdegames/debian/kpoker-trinity.links
index 8d789b45e..8d789b45e 100644
--- a/ubuntu/maverick/tdegames/debian/kpoker-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kpoker-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kpoker-trinity.manpages b/ubuntu/_base/tdegames/debian/kpoker-trinity.manpages
index 796a3f8bd..796a3f8bd 100644
--- a/ubuntu/maverick/tdegames/debian/kpoker-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kpoker-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kpoker-trinity.menu b/ubuntu/_base/tdegames/debian/kpoker-trinity.menu
index aa4aa37ec..aa4aa37ec 100644
--- a/ubuntu/maverick/tdegames/debian/kpoker-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kpoker-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kreversi-trinity.install b/ubuntu/_base/tdegames/debian/kreversi-trinity.install
index ba2878253..ba2878253 100644
--- a/ubuntu/maverick/tdegames/debian/kreversi-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kreversi-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kreversi-trinity.links b/ubuntu/_base/tdegames/debian/kreversi-trinity.links
index ad5f17a8f..ad5f17a8f 100644
--- a/ubuntu/maverick/tdegames/debian/kreversi-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kreversi-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kreversi-trinity.manpages b/ubuntu/_base/tdegames/debian/kreversi-trinity.manpages
index 70897c051..70897c051 100644
--- a/ubuntu/maverick/tdegames/debian/kreversi-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kreversi-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kreversi-trinity.menu b/ubuntu/_base/tdegames/debian/kreversi-trinity.menu
index 178e004ec..178e004ec 100644
--- a/ubuntu/maverick/tdegames/debian/kreversi-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kreversi-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/ksame-trinity.install b/ubuntu/_base/tdegames/debian/ksame-trinity.install
index e00484319..e00484319 100644
--- a/ubuntu/maverick/tdegames/debian/ksame-trinity.install
+++ b/ubuntu/_base/tdegames/debian/ksame-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/ksame-trinity.links b/ubuntu/_base/tdegames/debian/ksame-trinity.links
index 09425a104..09425a104 100644
--- a/ubuntu/maverick/tdegames/debian/ksame-trinity.links
+++ b/ubuntu/_base/tdegames/debian/ksame-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/ksame-trinity.manpages b/ubuntu/_base/tdegames/debian/ksame-trinity.manpages
index fcb8ade0e..fcb8ade0e 100644
--- a/ubuntu/maverick/tdegames/debian/ksame-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/ksame-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/ksame-trinity.menu b/ubuntu/_base/tdegames/debian/ksame-trinity.menu
index fd211fdc0..fd211fdc0 100644
--- a/ubuntu/maverick/tdegames/debian/ksame-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/ksame-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kshisen-trinity.install b/ubuntu/_base/tdegames/debian/kshisen-trinity.install
index 11e3696a4..11e3696a4 100644
--- a/ubuntu/maverick/tdegames/debian/kshisen-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kshisen-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kshisen-trinity.links b/ubuntu/_base/tdegames/debian/kshisen-trinity.links
index ae00c9136..ae00c9136 100644
--- a/ubuntu/maverick/tdegames/debian/kshisen-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kshisen-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kshisen-trinity.manpages b/ubuntu/_base/tdegames/debian/kshisen-trinity.manpages
index c1a26757e..c1a26757e 100644
--- a/ubuntu/maverick/tdegames/debian/kshisen-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kshisen-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kshisen-trinity.menu b/ubuntu/_base/tdegames/debian/kshisen-trinity.menu
index 58ac31ec2..58ac31ec2 100644
--- a/ubuntu/maverick/tdegames/debian/kshisen-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kshisen-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.install b/ubuntu/_base/tdegames/debian/ksirtet-trinity.install
index 9d1beca1b..9d1beca1b 100644
--- a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.install
+++ b/ubuntu/_base/tdegames/debian/ksirtet-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.links b/ubuntu/_base/tdegames/debian/ksirtet-trinity.links
index 220128ee9..220128ee9 100644
--- a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.links
+++ b/ubuntu/_base/tdegames/debian/ksirtet-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.manpages b/ubuntu/_base/tdegames/debian/ksirtet-trinity.manpages
index 08a43dd5a..08a43dd5a 100644
--- a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/ksirtet-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.menu b/ubuntu/_base/tdegames/debian/ksirtet-trinity.menu
index c690bbe58..c690bbe58 100644
--- a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/ksirtet-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.install b/ubuntu/_base/tdegames/debian/ksmiletris-trinity.install
index 5c6f2a3c2..5c6f2a3c2 100644
--- a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.install
+++ b/ubuntu/_base/tdegames/debian/ksmiletris-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.manpages b/ubuntu/_base/tdegames/debian/ksmiletris-trinity.manpages
index 7a07168e3..7a07168e3 100644
--- a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/ksmiletris-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.menu b/ubuntu/_base/tdegames/debian/ksmiletris-trinity.menu
index 4e81e3f3f..4e81e3f3f 100644
--- a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/ksmiletris-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/ksnake-trinity.install b/ubuntu/_base/tdegames/debian/ksnake-trinity.install
index 8bc7b7949..8bc7b7949 100644
--- a/ubuntu/maverick/tdegames/debian/ksnake-trinity.install
+++ b/ubuntu/_base/tdegames/debian/ksnake-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/ksnake-trinity.links b/ubuntu/_base/tdegames/debian/ksnake-trinity.links
index a790e936a..a790e936a 100644
--- a/ubuntu/maverick/tdegames/debian/ksnake-trinity.links
+++ b/ubuntu/_base/tdegames/debian/ksnake-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/ksnake-trinity.manpages b/ubuntu/_base/tdegames/debian/ksnake-trinity.manpages
index b477dd190..b477dd190 100644
--- a/ubuntu/maverick/tdegames/debian/ksnake-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/ksnake-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/ksnake-trinity.menu b/ubuntu/_base/tdegames/debian/ksnake-trinity.menu
index 98ce22e33..98ce22e33 100644
--- a/ubuntu/maverick/tdegames/debian/ksnake-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/ksnake-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.install b/ubuntu/_base/tdegames/debian/ksokoban-trinity.install
index b536d14da..b536d14da 100644
--- a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.install
+++ b/ubuntu/_base/tdegames/debian/ksokoban-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.links b/ubuntu/_base/tdegames/debian/ksokoban-trinity.links
index 9930c3548..9930c3548 100644
--- a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.links
+++ b/ubuntu/_base/tdegames/debian/ksokoban-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.manpages b/ubuntu/_base/tdegames/debian/ksokoban-trinity.manpages
index 502ee9496..502ee9496 100644
--- a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/ksokoban-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.menu b/ubuntu/_base/tdegames/debian/ksokoban-trinity.menu
index 93e2344c6..93e2344c6 100644
--- a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/ksokoban-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.install b/ubuntu/_base/tdegames/debian/kspaceduel-trinity.install
index c5dcbe931..c5dcbe931 100644
--- a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kspaceduel-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.links b/ubuntu/_base/tdegames/debian/kspaceduel-trinity.links
index 0182b926b..0182b926b 100644
--- a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kspaceduel-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.manpages b/ubuntu/_base/tdegames/debian/kspaceduel-trinity.manpages
index 8a48d9286..8a48d9286 100644
--- a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kspaceduel-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.menu b/ubuntu/_base/tdegames/debian/kspaceduel-trinity.menu
index a4aa04518..a4aa04518 100644
--- a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kspaceduel-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/ktron-trinity.install b/ubuntu/_base/tdegames/debian/ktron-trinity.install
index fa6991c24..fa6991c24 100644
--- a/ubuntu/maverick/tdegames/debian/ktron-trinity.install
+++ b/ubuntu/_base/tdegames/debian/ktron-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/ktron-trinity.links b/ubuntu/_base/tdegames/debian/ktron-trinity.links
index 1d133ef86..1d133ef86 100644
--- a/ubuntu/maverick/tdegames/debian/ktron-trinity.links
+++ b/ubuntu/_base/tdegames/debian/ktron-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/ktron-trinity.manpages b/ubuntu/_base/tdegames/debian/ktron-trinity.manpages
index c34c3e0bf..c34c3e0bf 100644
--- a/ubuntu/maverick/tdegames/debian/ktron-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/ktron-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/ktron-trinity.menu b/ubuntu/_base/tdegames/debian/ktron-trinity.menu
index 0b810a8a2..0b810a8a2 100644
--- a/ubuntu/maverick/tdegames/debian/ktron-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/ktron-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.install b/ubuntu/_base/tdegames/debian/ktuberling-trinity.install
index e3d4b617b..e3d4b617b 100644
--- a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.install
+++ b/ubuntu/_base/tdegames/debian/ktuberling-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.links b/ubuntu/_base/tdegames/debian/ktuberling-trinity.links
index 415a771ec..415a771ec 100644
--- a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.links
+++ b/ubuntu/_base/tdegames/debian/ktuberling-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.manpages b/ubuntu/_base/tdegames/debian/ktuberling-trinity.manpages
index cde8002fa..cde8002fa 100644
--- a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/ktuberling-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.menu b/ubuntu/_base/tdegames/debian/ktuberling-trinity.menu
index e4b841654..e4b841654 100644
--- a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/ktuberling-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.install b/ubuntu/_base/tdegames/debian/kwin4-trinity.install
index d085fb90e..d085fb90e 100644
--- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.install
+++ b/ubuntu/_base/tdegames/debian/kwin4-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.links b/ubuntu/_base/tdegames/debian/kwin4-trinity.links
index 9d620a1a3..9d620a1a3 100644
--- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.links
+++ b/ubuntu/_base/tdegames/debian/kwin4-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages b/ubuntu/_base/tdegames/debian/kwin4-trinity.manpages
index 5486638b1..5486638b1 100644
--- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/kwin4-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu b/ubuntu/_base/tdegames/debian/kwin4-trinity.menu
index 51f43cb8e..51f43cb8e 100644
--- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/kwin4-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install b/ubuntu/_base/tdegames/debian/libtdegames-trinity-dev.install
index 9640a4bc8..9640a4bc8 100644
--- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install
+++ b/ubuntu/_base/tdegames/debian/libtdegames-trinity-dev.install
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.doc-base b/ubuntu/_base/tdegames/debian/libtdegames-trinity-doc.doc-base
index 52c2ede6a..52c2ede6a 100644
--- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.doc-base
+++ b/ubuntu/_base/tdegames/debian/libtdegames-trinity-doc.doc-base
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.install b/ubuntu/_base/tdegames/debian/libtdegames-trinity-doc.install
index d810407d1..d810407d1 100644
--- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.install
+++ b/ubuntu/_base/tdegames/debian/libtdegames-trinity-doc.install
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.links b/ubuntu/_base/tdegames/debian/libtdegames-trinity-doc.links
index 560445cbd..560445cbd 100644
--- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-doc.links
+++ b/ubuntu/_base/tdegames/debian/libtdegames-trinity-doc.links
diff --git a/ubuntu/maverick/tdegames/debian/libtdegames1-trinity.install b/ubuntu/_base/tdegames/debian/libtdegames1-trinity.install
index 2759a4355..2759a4355 100644
--- a/ubuntu/maverick/tdegames/debian/libtdegames1-trinity.install
+++ b/ubuntu/_base/tdegames/debian/libtdegames1-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/lskat-trinity.install b/ubuntu/_base/tdegames/debian/lskat-trinity.install
index 64552943d..64552943d 100644
--- a/ubuntu/maverick/tdegames/debian/lskat-trinity.install
+++ b/ubuntu/_base/tdegames/debian/lskat-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/lskat-trinity.links b/ubuntu/_base/tdegames/debian/lskat-trinity.links
index 904bc2eab..904bc2eab 100644
--- a/ubuntu/maverick/tdegames/debian/lskat-trinity.links
+++ b/ubuntu/_base/tdegames/debian/lskat-trinity.links
diff --git a/ubuntu/maverick/tdegames/debian/lskat-trinity.manpages b/ubuntu/_base/tdegames/debian/lskat-trinity.manpages
index 728d1a013..728d1a013 100644
--- a/ubuntu/maverick/tdegames/debian/lskat-trinity.manpages
+++ b/ubuntu/_base/tdegames/debian/lskat-trinity.manpages
diff --git a/ubuntu/maverick/tdegames/debian/lskat-trinity.menu b/ubuntu/_base/tdegames/debian/lskat-trinity.menu
index eaf30b001..eaf30b001 100644
--- a/ubuntu/maverick/tdegames/debian/lskat-trinity.menu
+++ b/ubuntu/_base/tdegames/debian/lskat-trinity.menu
diff --git a/ubuntu/maverick/tdegames/debian/man/atlantik-trinity.man b/ubuntu/_base/tdegames/debian/man/atlantik-trinity.man
index 02dbae64e..02dbae64e 100644
--- a/ubuntu/maverick/tdegames/debian/man/atlantik-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/atlantik-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kasteroids-trinity.man b/ubuntu/_base/tdegames/debian/man/kasteroids-trinity.man
index 756238dac..756238dac 100644
--- a/ubuntu/maverick/tdegames/debian/man/kasteroids-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kasteroids-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/katomic-trinity.man b/ubuntu/_base/tdegames/debian/man/katomic-trinity.man
index 7672dae8f..7672dae8f 100644
--- a/ubuntu/maverick/tdegames/debian/man/katomic-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/katomic-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kbackgammon-trinity.man b/ubuntu/_base/tdegames/debian/man/kbackgammon-trinity.man
index 4a99ed275..4a99ed275 100644
--- a/ubuntu/maverick/tdegames/debian/man/kbackgammon-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kbackgammon-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kbattleship-trinity.man b/ubuntu/_base/tdegames/debian/man/kbattleship-trinity.man
index 6866f76a4..6866f76a4 100644
--- a/ubuntu/maverick/tdegames/debian/man/kbattleship-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kbattleship-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kblackbox-trinity.man b/ubuntu/_base/tdegames/debian/man/kblackbox-trinity.man
index ca3e10fa8..ca3e10fa8 100644
--- a/ubuntu/maverick/tdegames/debian/man/kblackbox-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kblackbox-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kbounce-trinity.man b/ubuntu/_base/tdegames/debian/man/kbounce-trinity.man
index 6faae7c7e..6faae7c7e 100644
--- a/ubuntu/maverick/tdegames/debian/man/kbounce-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kbounce-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kdeopt.part b/ubuntu/_base/tdegames/debian/man/kdeopt.part
index 0066c4463..0066c4463 100644
--- a/ubuntu/maverick/tdegames/debian/man/kdeopt.part
+++ b/ubuntu/_base/tdegames/debian/man/kdeopt.part
diff --git a/ubuntu/maverick/tdegames/debian/man/kenolaba-trinity.man b/ubuntu/_base/tdegames/debian/man/kenolaba-trinity.man
index 06a54b14b..06a54b14b 100644
--- a/ubuntu/maverick/tdegames/debian/man/kenolaba-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kenolaba-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kfouleggs-trinity.man b/ubuntu/_base/tdegames/debian/man/kfouleggs-trinity.man
index de6eb1de9..de6eb1de9 100644
--- a/ubuntu/maverick/tdegames/debian/man/kfouleggs-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kfouleggs-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kgoldrunner-trinity.man b/ubuntu/_base/tdegames/debian/man/kgoldrunner-trinity.man
index 03fe7666c..03fe7666c 100644
--- a/ubuntu/maverick/tdegames/debian/man/kgoldrunner-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kgoldrunner-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kjumpingcube-trinity.man b/ubuntu/_base/tdegames/debian/man/kjumpingcube-trinity.man
index e921fbe09..e921fbe09 100644
--- a/ubuntu/maverick/tdegames/debian/man/kjumpingcube-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kjumpingcube-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/klickety-trinity.man b/ubuntu/_base/tdegames/debian/man/klickety-trinity.man
index cce367ff1..cce367ff1 100644
--- a/ubuntu/maverick/tdegames/debian/man/klickety-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/klickety-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/klines-trinity.man b/ubuntu/_base/tdegames/debian/man/klines-trinity.man
index ce0a37657..ce0a37657 100644
--- a/ubuntu/maverick/tdegames/debian/man/klines-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/klines-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kmahjongg-trinity.man b/ubuntu/_base/tdegames/debian/man/kmahjongg-trinity.man
index 1462a45c4..1462a45c4 100644
--- a/ubuntu/maverick/tdegames/debian/man/kmahjongg-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kmahjongg-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kmines-trinity.man b/ubuntu/_base/tdegames/debian/man/kmines-trinity.man
index 6c4aa5ef1..6c4aa5ef1 100644
--- a/ubuntu/maverick/tdegames/debian/man/kmines-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kmines-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/knetwalk-trinity.man b/ubuntu/_base/tdegames/debian/man/knetwalk-trinity.man
index 47604e35f..47604e35f 100644
--- a/ubuntu/maverick/tdegames/debian/man/knetwalk-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/knetwalk-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kolf-trinity.man b/ubuntu/_base/tdegames/debian/man/kolf-trinity.man
index ee60dd824..ee60dd824 100644
--- a/ubuntu/maverick/tdegames/debian/man/kolf-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kolf-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/konquest-trinity.man b/ubuntu/_base/tdegames/debian/man/konquest-trinity.man
index 0cee58504..0cee58504 100644
--- a/ubuntu/maverick/tdegames/debian/man/konquest-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/konquest-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kpat-trinity.man b/ubuntu/_base/tdegames/debian/man/kpat-trinity.man
index 1cc1e6c28..1cc1e6c28 100644
--- a/ubuntu/maverick/tdegames/debian/man/kpat-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kpat-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kpoker-trinity.man b/ubuntu/_base/tdegames/debian/man/kpoker-trinity.man
index 036cfd97f..036cfd97f 100644
--- a/ubuntu/maverick/tdegames/debian/man/kpoker-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kpoker-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kreversi-trinity.man b/ubuntu/_base/tdegames/debian/man/kreversi-trinity.man
index a8f7e3e48..a8f7e3e48 100644
--- a/ubuntu/maverick/tdegames/debian/man/kreversi-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kreversi-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/ksame-trinity.man b/ubuntu/_base/tdegames/debian/man/ksame-trinity.man
index 4a5e767db..4a5e767db 100644
--- a/ubuntu/maverick/tdegames/debian/man/ksame-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/ksame-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kshisen-trinity.man b/ubuntu/_base/tdegames/debian/man/kshisen-trinity.man
index d29cf14f7..d29cf14f7 100644
--- a/ubuntu/maverick/tdegames/debian/man/kshisen-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kshisen-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/ksirtet-trinity.man b/ubuntu/_base/tdegames/debian/man/ksirtet-trinity.man
index c8cf6b6a3..c8cf6b6a3 100644
--- a/ubuntu/maverick/tdegames/debian/man/ksirtet-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/ksirtet-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/ksmiletris-trinity.man b/ubuntu/_base/tdegames/debian/man/ksmiletris-trinity.man
index 662c07ee5..662c07ee5 100644
--- a/ubuntu/maverick/tdegames/debian/man/ksmiletris-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/ksmiletris-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/ksnake-trinity.man b/ubuntu/_base/tdegames/debian/man/ksnake-trinity.man
index 0931d1177..0931d1177 100644
--- a/ubuntu/maverick/tdegames/debian/man/ksnake-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/ksnake-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/ksokoban-trinity.man b/ubuntu/_base/tdegames/debian/man/ksokoban-trinity.man
index 43992ee7c..43992ee7c 100644
--- a/ubuntu/maverick/tdegames/debian/man/ksokoban-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/ksokoban-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kspaceduel-trinity.man b/ubuntu/_base/tdegames/debian/man/kspaceduel-trinity.man
index b01ef2c11..b01ef2c11 100644
--- a/ubuntu/maverick/tdegames/debian/man/kspaceduel-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kspaceduel-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/ktron-trinity.man b/ubuntu/_base/tdegames/debian/man/ktron-trinity.man
index ad63c1efe..ad63c1efe 100644
--- a/ubuntu/maverick/tdegames/debian/man/ktron-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/ktron-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/ktuberling-trinity.man b/ubuntu/_base/tdegames/debian/man/ktuberling-trinity.man
index 4d7d220f3..4d7d220f3 100644
--- a/ubuntu/maverick/tdegames/debian/man/ktuberling-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/ktuberling-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man b/ubuntu/_base/tdegames/debian/man/kwin4-trinity.man
index 629ab3407..629ab3407 100644
--- a/ubuntu/maverick/tdegames/debian/man/kwin4-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kwin4-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man b/ubuntu/_base/tdegames/debian/man/kwin4proc-trinity.man
index 5b1856418..5b1856418 100644
--- a/ubuntu/maverick/tdegames/debian/man/kwin4proc-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/kwin4proc-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/lskat-trinity.man b/ubuntu/_base/tdegames/debian/man/lskat-trinity.man
index 58bafb445..58bafb445 100644
--- a/ubuntu/maverick/tdegames/debian/man/lskat-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/lskat-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/man/lskatproc-trinity.man b/ubuntu/_base/tdegames/debian/man/lskatproc-trinity.man
index 091193208..091193208 100644
--- a/ubuntu/maverick/tdegames/debian/man/lskatproc-trinity.man
+++ b/ubuntu/_base/tdegames/debian/man/lskatproc-trinity.man
diff --git a/ubuntu/maverick/tdegames/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdegames/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdegames/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdegames/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdegames/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdegames/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdegames/debian/patches/series b/ubuntu/_base/tdegames/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdegames/debian/patches/series
+++ b/ubuntu/_base/tdegames/debian/patches/series
diff --git a/ubuntu/maverick/tdegames/debian/rules b/ubuntu/_base/tdegames/debian/rules
index 5ccf864b4..5ccf864b4 100755
--- a/ubuntu/maverick/tdegames/debian/rules
+++ b/ubuntu/_base/tdegames/debian/rules
diff --git a/ubuntu/maverick/tdegames/debian/source/format b/ubuntu/_base/tdegames/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdegames/debian/source/format
+++ b/ubuntu/_base/tdegames/debian/source/format
diff --git a/ubuntu/maverick/tdegames/debian/source/options b/ubuntu/_base/tdegames/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdegames/debian/source/options
+++ b/ubuntu/_base/tdegames/debian/source/options
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-card-data-trinity.install b/ubuntu/_base/tdegames/debian/tdegames-card-data-trinity.install
index 32fae70ae..32fae70ae 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-card-data-trinity.install
+++ b/ubuntu/_base/tdegames/debian/tdegames-card-data-trinity.install
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.atlantik b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.atlantik
index e6f06fac0..e6f06fac0 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.atlantik
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.atlantik
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kasteroids b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kasteroids
index 29896b3bd..29896b3bd 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kasteroids
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kasteroids
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.katomic b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.katomic
index 6d71f9ab5..6d71f9ab5 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.katomic
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.katomic
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon
index 749faf880..749faf880 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kbackgammon
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbattleship b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kbattleship
index 8f4581054..8f4581054 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbattleship
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kbattleship
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kblackbox b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kblackbox
index aa22c016e..aa22c016e 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kblackbox
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kblackbox
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbounce b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kbounce
index 2f4d1ced8..2f4d1ced8 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kbounce
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kbounce
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kenolaba b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kenolaba
index 1afedaf84..1afedaf84 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kenolaba
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kenolaba
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs
index e01a70fa7..e01a70fa7 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kfouleggs
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner
index 0fbde7a2b..0fbde7a2b 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kgoldrunner
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube
index 089156088..089156088 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kjumpingcube
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.klines b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.klines
index 7cb3a2a60..7cb3a2a60 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.klines
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.klines
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg
index 81b627153..81b627153 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kmahjongg
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmines b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kmines
index 16933d9d8..16933d9d8 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kmines
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kmines
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kolf b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kolf
index 13cc06b3b..13cc06b3b 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kolf
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kolf
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.konquest b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.konquest
index dc011c860..dc011c860 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.konquest
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.konquest
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpat b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kpat
index 6abb31523..6abb31523 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpat
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kpat
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpoker b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kpoker
index 804226064..804226064 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kpoker
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kpoker
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kreversi b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kreversi
index eeed02ada..eeed02ada 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kreversi
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kreversi
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksame b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ksame
index b81db0dc2..b81db0dc2 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksame
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ksame
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kshisen b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kshisen
index b713f3305..b713f3305 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kshisen
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kshisen
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksirtet b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ksirtet
index bbdaa1148..bbdaa1148 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksirtet
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ksirtet
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksnake b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ksnake
index c98f2f8ab..c98f2f8ab 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksnake
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ksnake
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksokoban b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ksokoban
index b169d8641..b169d8641 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ksokoban
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ksokoban
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel
index ef41f0a6b..ef41f0a6b 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kspaceduel
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktron b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ktron
index c213d7eaf..c213d7eaf 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktron
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ktron
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktuberling b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ktuberling
index 9a37a4d26..9a37a4d26 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.ktuberling
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.ktuberling
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4 b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kwin4
index 273d4c727..273d4c727 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.kwin4
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.kwin4
diff --git a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.lskat b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.lskat
index 0a6452e61..0a6452e61 100644
--- a/ubuntu/maverick/tdegames/debian/tdegames-doc-html.doc-base.lskat
+++ b/ubuntu/_base/tdegames/debian/tdegames-doc-html.doc-base.lskat
diff --git a/ubuntu/maverick/tdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 813e7d6f7..813e7d6f7 100644
--- a/ubuntu/maverick/tdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdegraphics/debian/cdbs/debian-qt-kde.mk
index 933c51556..933c51556 100644
--- a/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdegraphics/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk b/ubuntu/_base/tdegraphics/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdegraphics/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdegraphics/debian/cdbs/versions.pl b/ubuntu/_base/tdegraphics/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdegraphics/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdegraphics/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdegraphics/debian/changelog b/ubuntu/_base/tdegraphics/debian/changelog
index 64541bd36..64541bd36 100644
--- a/ubuntu/maverick/tdegraphics/debian/changelog
+++ b/ubuntu/_base/tdegraphics/debian/changelog
diff --git a/ubuntu/maverick/tdegraphics/debian/compat b/ubuntu/_base/tdegraphics/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdegraphics/debian/compat
+++ b/ubuntu/_base/tdegraphics/debian/compat
diff --git a/ubuntu/maverick/tdegraphics/debian/control b/ubuntu/_base/tdegraphics/debian/control
index 1d057bf4e..1d057bf4e 100644
--- a/ubuntu/maverick/tdegraphics/debian/control
+++ b/ubuntu/_base/tdegraphics/debian/control
diff --git a/ubuntu/maverick/tdegraphics/debian/copyright b/ubuntu/_base/tdegraphics/debian/copyright
index 13e809000..13e809000 100644
--- a/ubuntu/maverick/tdegraphics/debian/copyright
+++ b/ubuntu/_base/tdegraphics/debian/copyright
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kcolorchooser-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kcolorchooser-16.xpm
index 22a32da35..22a32da35 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kcolorchooser-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kcolorchooser-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kcolorchooser.xpm b/ubuntu/_base/tdegraphics/debian/icons/kcolorchooser.xpm
index 22d830b4b..22d830b4b 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kcolorchooser.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kcolorchooser.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kcoloredit-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kcoloredit-16.xpm
index 8e97bb914..8e97bb914 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kcoloredit-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kcoloredit-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kcoloredit.xpm b/ubuntu/_base/tdegraphics/debian/icons/kcoloredit.xpm
index 83b310ff0..83b310ff0 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kcoloredit.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kcoloredit.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kdvi-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kdvi-16.xpm
index db22767d4..db22767d4 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kdvi-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kdvi-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kdvi.xpm b/ubuntu/_base/tdegraphics/debian/icons/kdvi.xpm
index fe4db5b6c..fe4db5b6c 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kdvi.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kdvi.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kfax-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kfax-16.xpm
index 48804f8a5..48804f8a5 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kfax-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kfax-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kfax.xpm b/ubuntu/_base/tdegraphics/debian/icons/kfax.xpm
index bd969b13a..bd969b13a 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kfax.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kfax.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kfaxview-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kfaxview-16.xpm
index f5b699dcb..f5b699dcb 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kfaxview-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kfaxview-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kfaxview.xpm b/ubuntu/_base/tdegraphics/debian/icons/kfaxview.xpm
index aea8354f4..aea8354f4 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kfaxview.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kfaxview.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kghostview-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kghostview-16.xpm
index ccb9fa8ae..ccb9fa8ae 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kghostview-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kghostview-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kghostview.xpm b/ubuntu/_base/tdegraphics/debian/icons/kghostview.xpm
index 38bb64331..38bb64331 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kghostview.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kghostview.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kolourpaint-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kolourpaint-16.xpm
index 79cabaf05..79cabaf05 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kolourpaint-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kolourpaint-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kolourpaint.xpm b/ubuntu/_base/tdegraphics/debian/icons/kolourpaint.xpm
index 32eba9310..32eba9310 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kolourpaint.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kolourpaint.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kooka-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kooka-16.xpm
index 46cd10535..46cd10535 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kooka-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kooka-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kooka.xpm b/ubuntu/_base/tdegraphics/debian/icons/kooka.xpm
index c720c7d21..c720c7d21 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kooka.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kooka.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kpdf-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kpdf-16.xpm
index ce5082f88..ce5082f88 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kpdf-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kpdf-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kpdf.xpm b/ubuntu/_base/tdegraphics/debian/icons/kpdf.xpm
index ae032c341..ae032c341 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kpdf.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kpdf.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kpovmodeler-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kpovmodeler-16.xpm
index c25f014f0..c25f014f0 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kpovmodeler-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kpovmodeler-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kpovmodeler.xpm b/ubuntu/_base/tdegraphics/debian/icons/kpovmodeler.xpm
index a998ccda9..a998ccda9 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kpovmodeler.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kpovmodeler.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kruler-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kruler-16.xpm
index 3e5a27d03..3e5a27d03 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kruler-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kruler-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kruler.xpm b/ubuntu/_base/tdegraphics/debian/icons/kruler.xpm
index 030fad1f5..030fad1f5 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kruler.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kruler.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/ksnapshot-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/ksnapshot-16.xpm
index f97cb30aa..f97cb30aa 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/ksnapshot-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/ksnapshot-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/ksnapshot.xpm b/ubuntu/_base/tdegraphics/debian/icons/ksnapshot.xpm
index 302c59d25..302c59d25 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/ksnapshot.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/ksnapshot.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kuickshow-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kuickshow-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kuickshow-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kuickshow.xpm b/ubuntu/_base/tdegraphics/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kuickshow.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kuickshow.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kview-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/kview-16.xpm
index 886c4821b..886c4821b 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kview-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kview-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/kview.xpm b/ubuntu/_base/tdegraphics/debian/icons/kview.xpm
index 606fc37e6..606fc37e6 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/kview.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/kview.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/tdeiconedit-16.xpm b/ubuntu/_base/tdegraphics/debian/icons/tdeiconedit-16.xpm
index 1eff4882e..1eff4882e 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/tdeiconedit-16.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/tdeiconedit-16.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/icons/tdeiconedit.xpm b/ubuntu/_base/tdegraphics/debian/icons/tdeiconedit.xpm
index 7bc8278e4..7bc8278e4 100644
--- a/ubuntu/maverick/tdegraphics/debian/icons/tdeiconedit.xpm
+++ b/ubuntu/_base/tdegraphics/debian/icons/tdeiconedit.xpm
diff --git a/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install b/ubuntu/_base/tdegraphics/debian/kamera-trinity.install
index f1ba0c99b..f1ba0c99b 100644
--- a/ubuntu/maverick/tdegraphics/debian/kamera-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kamera-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install b/ubuntu/_base/tdegraphics/debian/kcoloredit-trinity.install
index c760fe7d7..c760fe7d7 100644
--- a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kcoloredit-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kcoloredit-trinity.manpages
index e4673b667..e4673b667 100644
--- a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kcoloredit-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.menu b/ubuntu/_base/tdegraphics/debian/kcoloredit-trinity.menu
index 0ac64569b..0ac64569b 100644
--- a/ubuntu/maverick/tdegraphics/debian/kcoloredit-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kcoloredit-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install b/ubuntu/_base/tdegraphics/debian/kdvi-trinity.install
index 0eeb3b15f..0eeb3b15f 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kdvi-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kdvi-trinity.manpages
index 6cab6e597..6cab6e597 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kdvi-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu b/ubuntu/_base/tdegraphics/debian/kdvi-trinity.menu
index 0e6e44390..0e6e44390 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kdvi-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.mime b/ubuntu/_base/tdegraphics/debian/kdvi-trinity.mime
index 61bd2bb9b..61bd2bb9b 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.mime
+++ b/ubuntu/_base/tdegraphics/debian/kdvi-trinity.mime
diff --git a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.install b/ubuntu/_base/tdegraphics/debian/kfax-trinity.install
index c38b88569..c38b88569 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kfax-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kfax-trinity.manpages
index 57b6c7961..57b6c7961 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kfax-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.menu b/ubuntu/_base/tdegraphics/debian/kfax-trinity.menu
index f9a2df65c..f9a2df65c 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kfax-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.mime b/ubuntu/_base/tdegraphics/debian/kfax-trinity.mime
index e4aede21c..e4aede21c 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfax-trinity.mime
+++ b/ubuntu/_base/tdegraphics/debian/kfax-trinity.mime
diff --git a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.install b/ubuntu/_base/tdegraphics/debian/kfaxview-trinity.install
index 90e21b08c..90e21b08c 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kfaxview-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.lintian b/ubuntu/_base/tdegraphics/debian/kfaxview-trinity.lintian
index 77a1b0e8e..77a1b0e8e 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/ubuntu/_base/tdegraphics/debian/kfaxview-trinity.lintian
diff --git a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kfaxview-trinity.manpages
index a30d1c56a..a30d1c56a 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kfaxview-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.menu b/ubuntu/_base/tdegraphics/debian/kfaxview-trinity.menu
index 578a03eb0..578a03eb0 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kfaxview-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install b/ubuntu/_base/tdegraphics/debian/kgamma-trinity.install
index 3e8fa0bb8..3e8fa0bb8 100644
--- a/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kgamma-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.install
index add2d1e01..add2d1e01 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.lintian b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.lintian
index 00a976862..00a976862 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.lintian
+++ b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.lintian
diff --git a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.manpages
index 8cfcbdec7..8cfcbdec7 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.menu
index c736aadeb..c736aadeb 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.mime b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.mime
index b8894e89c..b8894e89c 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.mime
+++ b/ubuntu/_base/tdegraphics/debian/kghostview-trinity.mime
diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install b/ubuntu/_base/tdegraphics/debian/kmrml-trinity.install
index f5de1ad92..f5de1ad92 100644
--- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kmrml-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian b/ubuntu/_base/tdegraphics/debian/kmrml-trinity.lintian
index 0193c9699..0193c9699 100644
--- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
+++ b/ubuntu/_base/tdegraphics/debian/kmrml-trinity.lintian
diff --git a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.postinst b/ubuntu/_base/tdegraphics/debian/kmrml-trinity.postinst
index 62563a4a4..62563a4a4 100644
--- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.postinst
+++ b/ubuntu/_base/tdegraphics/debian/kmrml-trinity.postinst
diff --git a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install b/ubuntu/_base/tdegraphics/debian/kolourpaint-trinity.install
index 0f1bc5dcc..0f1bc5dcc 100644
--- a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kolourpaint-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kolourpaint-trinity.manpages
index a10ddf05a..a10ddf05a 100644
--- a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kolourpaint-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.menu b/ubuntu/_base/tdegraphics/debian/kolourpaint-trinity.menu
index e975fb924..e975fb924 100644
--- a/ubuntu/maverick/tdegraphics/debian/kolourpaint-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kolourpaint-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install b/ubuntu/_base/tdegraphics/debian/kooka-trinity.install
index 5330dc6ab..5330dc6ab 100644
--- a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kooka-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kooka-trinity.manpages
index 319f8652c..319f8652c 100644
--- a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kooka-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.menu b/ubuntu/_base/tdegraphics/debian/kooka-trinity.menu
index 7160864c7..7160864c7 100644
--- a/ubuntu/maverick/tdegraphics/debian/kooka-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kooka-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install b/ubuntu/_base/tdegraphics/debian/kpdf-trinity.install
index 640ebdb6e..640ebdb6e 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kpdf-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kpdf-trinity.manpages
index 36f3caafb..36f3caafb 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kpdf-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.menu b/ubuntu/_base/tdegraphics/debian/kpdf-trinity.menu
index 2c47592cb..2c47592cb 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kpdf-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.mime b/ubuntu/_base/tdegraphics/debian/kpdf-trinity.mime
index 7592a8adb..7592a8adb 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpdf-trinity.mime
+++ b/ubuntu/_base/tdegraphics/debian/kpdf-trinity.mime
diff --git a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install b/ubuntu/_base/tdegraphics/debian/kpovmodeler-trinity.install
index 4cbc774ae..4cbc774ae 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kpovmodeler-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.lintian b/ubuntu/_base/tdegraphics/debian/kpovmodeler-trinity.lintian
index 354b0da93..354b0da93 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/ubuntu/_base/tdegraphics/debian/kpovmodeler-trinity.lintian
diff --git a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kpovmodeler-trinity.manpages
index 11c1a16f8..11c1a16f8 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kpovmodeler-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu b/ubuntu/_base/tdegraphics/debian/kpovmodeler-trinity.menu
index dfbeb0de3..dfbeb0de3 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kpovmodeler-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install b/ubuntu/_base/tdegraphics/debian/kruler-trinity.install
index 87fa208d5..87fa208d5 100644
--- a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kruler-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kruler-trinity.manpages
index aac20ba29..aac20ba29 100644
--- a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kruler-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.menu b/ubuntu/_base/tdegraphics/debian/kruler-trinity.menu
index 3a16985a9..3a16985a9 100644
--- a/ubuntu/maverick/tdegraphics/debian/kruler-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kruler-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install b/ubuntu/_base/tdegraphics/debian/ksnapshot-trinity.install
index 9725e1d31..9725e1d31 100644
--- a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/ksnapshot-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.manpages b/ubuntu/_base/tdegraphics/debian/ksnapshot-trinity.manpages
index efb781eba..efb781eba 100644
--- a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/ksnapshot-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.menu b/ubuntu/_base/tdegraphics/debian/ksnapshot-trinity.menu
index b26ad0ebb..b26ad0ebb 100644
--- a/ubuntu/maverick/tdegraphics/debian/ksnapshot-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/ksnapshot-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/ksvg-trinity.install b/ubuntu/_base/tdegraphics/debian/ksvg-trinity.install
index e7264cbb8..e7264cbb8 100644
--- a/ubuntu/maverick/tdegraphics/debian/ksvg-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/ksvg-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/ksvg-trinity.lintian b/ubuntu/_base/tdegraphics/debian/ksvg-trinity.lintian
index 64f139273..64f139273 100644
--- a/ubuntu/maverick/tdegraphics/debian/ksvg-trinity.lintian
+++ b/ubuntu/_base/tdegraphics/debian/ksvg-trinity.lintian
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install b/ubuntu/_base/tdegraphics/debian/kuickshow-trinity.install
index d8f2d8f7e..d8f2d8f7e 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kuickshow-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/_base/tdegraphics/debian/kuickshow-trinity.lintian
index 89f453cea..89f453cea 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/_base/tdegraphics/debian/kuickshow-trinity.lintian
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kuickshow-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.menu b/ubuntu/_base/tdegraphics/debian/kuickshow-trinity.menu
index 9c1e89437..9c1e89437 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kuickshow-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install b/ubuntu/_base/tdegraphics/debian/kview-trinity.install
index ea22868e9..ea22868e9 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kview-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian b/ubuntu/_base/tdegraphics/debian/kview-trinity.lintian
index fc787acd7..fc787acd7 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian
+++ b/ubuntu/_base/tdegraphics/debian/kview-trinity.lintian
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kview-trinity.manpages
index bad8bf322..bad8bf322 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kview-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.menu b/ubuntu/_base/tdegraphics/debian/kview-trinity.menu
index f4bad022f..f4bad022f 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/kview-trinity.menu
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.mime b/ubuntu/_base/tdegraphics/debian/kview-trinity.mime
index 16e079720..16e079720 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.mime
+++ b/ubuntu/_base/tdegraphics/debian/kview-trinity.mime
diff --git a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install b/ubuntu/_base/tdegraphics/debian/kviewshell-trinity.install
index 78a5947e3..78a5947e3 100644
--- a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/kviewshell-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian b/ubuntu/_base/tdegraphics/debian/kviewshell-trinity.lintian
index 1a2ace9c6..1a2ace9c6 100644
--- a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian
+++ b/ubuntu/_base/tdegraphics/debian/kviewshell-trinity.lintian
diff --git a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.manpages b/ubuntu/_base/tdegraphics/debian/kviewshell-trinity.manpages
index 89af3c5f2..89af3c5f2 100644
--- a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/kviewshell-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/libkscan-dev-trinity.install b/ubuntu/_base/tdegraphics/debian/libkscan-dev-trinity.install
index 29764eb5d..29764eb5d 100644
--- a/ubuntu/maverick/tdegraphics/debian/libkscan-dev-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/libkscan-dev-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/libkscan1-trinity.install b/ubuntu/_base/tdegraphics/debian/libkscan1-trinity.install
index 00674e14c..00674e14c 100644
--- a/ubuntu/maverick/tdegraphics/debian/libkscan1-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/libkscan1-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install b/ubuntu/_base/tdegraphics/debian/libpoppler-tqt-dev.install
index f737043af..f737043af 100644
--- a/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install
+++ b/ubuntu/_base/tdegraphics/debian/libpoppler-tqt-dev.install
diff --git a/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt.install b/ubuntu/_base/tdegraphics/debian/libpoppler-tqt.install
index d63075962..d63075962 100644
--- a/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt.install
+++ b/ubuntu/_base/tdegraphics/debian/libpoppler-tqt.install
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kcolorchooser.1 b/ubuntu/_base/tdegraphics/debian/man/kcolorchooser.1
index d0fd9cfbb..d0fd9cfbb 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kcolorchooser.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kcolorchooser.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kcoloredit.1 b/ubuntu/_base/tdegraphics/debian/man/kcoloredit.1
index 3318864e0..3318864e0 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kcoloredit.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kcoloredit.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kdvi.1 b/ubuntu/_base/tdegraphics/debian/man/kdvi.1
index f1df971ad..f1df971ad 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kdvi.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kdvi.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kfax.1 b/ubuntu/_base/tdegraphics/debian/man/kfax.1
index ac7583ccf..ac7583ccf 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kfax.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kfax.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kfaxview.1 b/ubuntu/_base/tdegraphics/debian/man/kfaxview.1
index 592c64c09..592c64c09 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kfaxview.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kfaxview.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kghostview.1 b/ubuntu/_base/tdegraphics/debian/man/kghostview.1
index be63ba0f3..be63ba0f3 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kghostview.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kghostview.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kolourpaint.1 b/ubuntu/_base/tdegraphics/debian/man/kolourpaint.1
index 42a126a85..42a126a85 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kolourpaint.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kolourpaint.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kooka.1 b/ubuntu/_base/tdegraphics/debian/man/kooka.1
index a8f34e419..a8f34e419 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kooka.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kooka.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kpdf.1 b/ubuntu/_base/tdegraphics/debian/man/kpdf.1
index fc0c59534..fc0c59534 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kpdf.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kpdf.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kpovmodeler.1 b/ubuntu/_base/tdegraphics/debian/man/kpovmodeler.1
index 3d536d26e..3d536d26e 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kpovmodeler.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kpovmodeler.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kruler.1 b/ubuntu/_base/tdegraphics/debian/man/kruler.1
index 9e32021cd..9e32021cd 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kruler.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kruler.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/ksnapshot.1 b/ubuntu/_base/tdegraphics/debian/man/ksnapshot.1
index 250ca0ef6..250ca0ef6 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/ksnapshot.1
+++ b/ubuntu/_base/tdegraphics/debian/man/ksnapshot.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kuickshow.1 b/ubuntu/_base/tdegraphics/debian/man/kuickshow.1
index bf5caf30c..bf5caf30c 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kuickshow.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kuickshow.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kview.1 b/ubuntu/_base/tdegraphics/debian/man/kview.1
index 64a2b6928..64a2b6928 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kview.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kview.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/kviewshell.1 b/ubuntu/_base/tdegraphics/debian/man/kviewshell.1
index 83d0e24da..83d0e24da 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/kviewshell.1
+++ b/ubuntu/_base/tdegraphics/debian/man/kviewshell.1
diff --git a/ubuntu/maverick/tdegraphics/debian/man/tdeiconedit.1 b/ubuntu/_base/tdegraphics/debian/man/tdeiconedit.1
index 70bcb510a..70bcb510a 100644
--- a/ubuntu/maverick/tdegraphics/debian/man/tdeiconedit.1
+++ b/ubuntu/_base/tdegraphics/debian/man/tdeiconedit.1
diff --git a/ubuntu/maverick/tdegraphics/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdegraphics/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdegraphics/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdegraphics/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdegraphics/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdegraphics/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdegraphics/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdegraphics/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdegraphics/debian/patches/series b/ubuntu/_base/tdegraphics/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdegraphics/debian/patches/series
+++ b/ubuntu/_base/tdegraphics/debian/patches/series
diff --git a/ubuntu/maverick/tdegraphics/debian/rules b/ubuntu/_base/tdegraphics/debian/rules
index 6d3995324..6d3995324 100755
--- a/ubuntu/maverick/tdegraphics/debian/rules
+++ b/ubuntu/_base/tdegraphics/debian/rules
diff --git a/ubuntu/maverick/tdegraphics/debian/source/format b/ubuntu/_base/tdegraphics/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdegraphics/debian/source/format
+++ b/ubuntu/_base/tdegraphics/debian/source/format
diff --git a/ubuntu/maverick/tdegraphics/debian/source/options b/ubuntu/_base/tdegraphics/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdegraphics/debian/source/options
+++ b/ubuntu/_base/tdegraphics/debian/source/options
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
index e441a4e56..e441a4e56 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kamera
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
index 23b6ad343..23b6ad343 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kcoloredit
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
index ae8577c8c..ae8577c8c 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kdvi
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
index 1c42db775..1c42db775 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kgamma
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
index ffb52fadc..ffb52fadc 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kghostview
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
index 679ac479b..679ac479b 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kolourpaint
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
index 74b50b803..74b50b803 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kooka
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
index 28be92bc1..28be92bc1 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpdf
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
index 943fd3491..943fd3491 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kpovmodeler
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
index b24e03ab3..b24e03ab3 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kruler
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
index 9288e66ec..9288e66ec 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.ksnapshot
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
index d9d82f118..d9d82f118 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kuickshow
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
index 7e9cc053e..7e9cc053e 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.kview
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit
index fb303793d..fb303793d 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-doc-html.doc-base.tdeiconedit
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-tdefile-plugins-trinity.install b/ubuntu/_base/tdegraphics/debian/tdegraphics-tdefile-plugins-trinity.install
index 02ffc23c6..02ffc23c6 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-tdefile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install b/ubuntu/_base/tdegraphics/debian/tdegraphics-trinity-dev.install
index f5f48fee4..f5f48fee4 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-trinity-dev.install
+++ b/ubuntu/_base/tdegraphics/debian/tdegraphics-trinity-dev.install
diff --git a/ubuntu/maverick/tdegraphics/debian/tdeiconedit-trinity.install b/ubuntu/_base/tdegraphics/debian/tdeiconedit-trinity.install
index cb2ca7535..cb2ca7535 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdeiconedit-trinity.install
+++ b/ubuntu/_base/tdegraphics/debian/tdeiconedit-trinity.install
diff --git a/ubuntu/maverick/tdegraphics/debian/tdeiconedit-trinity.manpages b/ubuntu/_base/tdegraphics/debian/tdeiconedit-trinity.manpages
index e975ab6b6..e975ab6b6 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdeiconedit-trinity.manpages
+++ b/ubuntu/_base/tdegraphics/debian/tdeiconedit-trinity.manpages
diff --git a/ubuntu/maverick/tdegraphics/debian/tdeiconedit-trinity.menu b/ubuntu/_base/tdegraphics/debian/tdeiconedit-trinity.menu
index fd4c9d6fe..fd4c9d6fe 100644
--- a/ubuntu/maverick/tdegraphics/debian/tdeiconedit-trinity.menu
+++ b/ubuntu/_base/tdegraphics/debian/tdeiconedit-trinity.menu
diff --git a/ubuntu/maverick/tdelibs/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdelibs/debian/cdbs/debian-qt-kde.mk
index d29480355..d29480355 100644
--- a/ubuntu/maverick/tdelibs/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdelibs/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk b/ubuntu/_base/tdelibs/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdelibs/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdelibs/debian/cdbs/versions.pl b/ubuntu/_base/tdelibs/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdelibs/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdelibs/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/_base/tdelibs/debian/changelog
index 10543db0e..10543db0e 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/_base/tdelibs/debian/changelog
diff --git a/ubuntu/maverick/tdelibs/debian/compat b/ubuntu/_base/tdelibs/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdelibs/debian/compat
+++ b/ubuntu/_base/tdelibs/debian/compat
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/_base/tdelibs/debian/control
index 6f8d18f51..6f8d18f51 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/_base/tdelibs/debian/control
diff --git a/ubuntu/maverick/tdelibs/debian/copyright b/ubuntu/_base/tdelibs/debian/copyright
index 98a9479a6..98a9479a6 100644
--- a/ubuntu/maverick/tdelibs/debian/copyright
+++ b/ubuntu/_base/tdelibs/debian/copyright
diff --git a/ubuntu/maverick/tdelibs/debian/icons/abouttde-kubuntu.png.uu b/ubuntu/_base/tdelibs/debian/icons/abouttde-kubuntu.png.uu
index 9c8b56292..9c8b56292 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/abouttde-kubuntu.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/abouttde-kubuntu.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr128-device-computer.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr128-device-computer.png.uu
index 9d4235de5..9d4235de5 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr128-device-computer.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr128-device-computer.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr16-action-hibernate.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr16-action-hibernate.png.uu
index 42b17fafe..42b17fafe 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr16-action-hibernate.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr16-action-hibernate.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr16-action-suspend.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr16-action-suspend.png.uu
index 75a91ef03..75a91ef03 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr16-action-suspend.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr16-action-suspend.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr16-device-computer.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr16-device-computer.png.uu
index d4c10a2d8..d4c10a2d8 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr16-device-computer.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr16-device-computer.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr22-action-hibernate.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr22-action-hibernate.png.uu
index 567d6ee12..567d6ee12 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr22-action-hibernate.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr22-action-hibernate.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr22-action-suspend.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr22-action-suspend.png.uu
index 59147edcf..59147edcf 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr22-action-suspend.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr22-action-suspend.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr22-device-computer.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr22-device-computer.png.uu
index a4a162ca8..a4a162ca8 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr22-device-computer.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr22-device-computer.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr32-action-hibernate.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr32-action-hibernate.png.uu
index 7999fe293..7999fe293 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr32-action-hibernate.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr32-action-hibernate.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr32-action-suspend.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr32-action-suspend.png.uu
index 239f329fe..239f329fe 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr32-action-suspend.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr32-action-suspend.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr32-device-computer.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr32-device-computer.png.uu
index 24e3cb2ac..24e3cb2ac 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr32-device-computer.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr32-device-computer.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr48-action-hibernate.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr48-action-hibernate.png.uu
index 0cbac6155..0cbac6155 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr48-action-hibernate.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr48-action-hibernate.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr48-action-suspend.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr48-action-suspend.png.uu
index 7682a4e9f..7682a4e9f 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr48-action-suspend.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr48-action-suspend.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr48-device-computer.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr48-device-computer.png.uu
index c3aac48b7..c3aac48b7 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr48-device-computer.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr48-device-computer.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/cr64-device-computer.png.uu b/ubuntu/_base/tdelibs/debian/icons/cr64-device-computer.png.uu
index 17baa75b9..17baa75b9 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/cr64-device-computer.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/cr64-device-computer.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/crsc-device-computer.svgz.uu b/ubuntu/_base/tdelibs/debian/icons/crsc-device-computer.svgz.uu
index c84884862..c84884862 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/crsc-device-computer.svgz.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/crsc-device-computer.svgz.uu
diff --git a/ubuntu/maverick/tdelibs/debian/icons/launchpad.png.uu b/ubuntu/_base/tdelibs/debian/icons/launchpad.png.uu
index 854548828..854548828 100644
--- a/ubuntu/maverick/tdelibs/debian/icons/launchpad.png.uu
+++ b/ubuntu/_base/tdelibs/debian/icons/launchpad.png.uu
diff --git a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl b/ubuntu/_base/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
index c71551dc5..c71551dc5 100644
--- a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
+++ b/ubuntu/_base/tdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
diff --git a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/findfiles b/ubuntu/_base/tdelibs/debian/kubuntu-desktop-i18n/findfiles
index e74100337..e74100337 100644
--- a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/findfiles
+++ b/ubuntu/_base/tdelibs/debian/kubuntu-desktop-i18n/findfiles
diff --git a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/msgsplit b/ubuntu/_base/tdelibs/debian/kubuntu-desktop-i18n/msgsplit
index 41481d336..41481d336 100644
--- a/ubuntu/maverick/tdelibs/debian/kubuntu-desktop-i18n/msgsplit
+++ b/ubuntu/_base/tdelibs/debian/kubuntu-desktop-i18n/msgsplit
diff --git a/ubuntu/maverick/tdelibs/debian/man/artsmessage-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/artsmessage-trinity.sgml
index e0950cfe4..e0950cfe4 100644
--- a/ubuntu/maverick/tdelibs/debian/man/artsmessage-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/artsmessage-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/cupsdconf-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/cupsdconf-trinity.sgml
index 0960c98e6..0960c98e6 100644
--- a/ubuntu/maverick/tdelibs/debian/man/cupsdconf-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/cupsdconf-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/cupsdoprint-trinity.1 b/ubuntu/_base/tdelibs/debian/man/cupsdoprint-trinity.1
index 89275a0f7..89275a0f7 100644
--- a/ubuntu/maverick/tdelibs/debian/man/cupsdoprint-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/cupsdoprint-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/dcop-trinity.sgml
index 499da537e..499da537e 100644
--- a/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/dcop-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcopclient-trinity.1 b/ubuntu/_base/tdelibs/debian/man/dcopclient-trinity.1
index b93446c95..b93446c95 100644
--- a/ubuntu/maverick/tdelibs/debian/man/dcopclient-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/dcopclient-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcopfind-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/dcopfind-trinity.sgml
index ee71e4c05..ee71e4c05 100644
--- a/ubuntu/maverick/tdelibs/debian/man/dcopfind-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/dcopfind-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcopobject-trinity.1 b/ubuntu/_base/tdelibs/debian/man/dcopobject-trinity.1
index 9b21d0f22..9b21d0f22 100644
--- a/ubuntu/maverick/tdelibs/debian/man/dcopobject-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/dcopobject-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcopquit-trinity.1 b/ubuntu/_base/tdelibs/debian/man/dcopquit-trinity.1
index 897d4de45..897d4de45 100644
--- a/ubuntu/maverick/tdelibs/debian/man/dcopquit-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/dcopquit-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcopref-trinity.1 b/ubuntu/_base/tdelibs/debian/man/dcopref-trinity.1
index 15d8c93da..15d8c93da 100644
--- a/ubuntu/maverick/tdelibs/debian/man/dcopref-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/dcopref-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcopserver-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/dcopserver-trinity.sgml
index 69603793b..69603793b 100644
--- a/ubuntu/maverick/tdelibs/debian/man/dcopserver-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/dcopserver-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcopserver_shutdown-trinity.1 b/ubuntu/_base/tdelibs/debian/man/dcopserver_shutdown-trinity.1
index 330ff0fd5..330ff0fd5 100644
--- a/ubuntu/maverick/tdelibs/debian/man/dcopserver_shutdown-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/dcopserver_shutdown-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcopstart-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/dcopstart-trinity.sgml
index 399d95c60..399d95c60 100644
--- a/ubuntu/maverick/tdelibs/debian/man/dcopstart-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/dcopstart-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/fileshareset-trinity.1 b/ubuntu/_base/tdelibs/debian/man/fileshareset-trinity.1
index de354f88f..de354f88f 100644
--- a/ubuntu/maverick/tdelibs/debian/man/fileshareset-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/fileshareset-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/imagetops-trinity.1 b/ubuntu/_base/tdelibs/debian/man/imagetops-trinity.1
index e29b0020e..e29b0020e 100644
--- a/ubuntu/maverick/tdelibs/debian/man/imagetops-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/imagetops-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/kaddprinterwizard-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/kaddprinterwizard-trinity.sgml
index d141dca89..d141dca89 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kaddprinterwizard-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/kaddprinterwizard-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/kcookiejar-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/kcookiejar-trinity.sgml
index 27aa2382c..27aa2382c 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kcookiejar-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/kcookiejar-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/kded-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/kded-trinity.sgml
index 34c664c3e..34c664c3e 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kded-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/kded-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/kdontchangethehostname-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/kdontchangethehostname-trinity.sgml
index 6f9866156..6f9866156 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kdontchangethehostname-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/kdontchangethehostname-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/kgrantpty-trinity.1 b/ubuntu/_base/tdelibs/debian/man/kgrantpty-trinity.1
index 22aa507de..22aa507de 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kgrantpty-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/kgrantpty-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/kinstalltheme-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/kinstalltheme-trinity.sgml
index dcf57599a..dcf57599a 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kinstalltheme-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/kinstalltheme-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/kpac_dhcp_helper-trinity.1 b/ubuntu/_base/tdelibs/debian/man/kpac_dhcp_helper-trinity.1
index 21066e002..21066e002 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kpac_dhcp_helper-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/kpac_dhcp_helper-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/kshell-trinity.1 b/ubuntu/_base/tdelibs/debian/man/kshell-trinity.1
index 942f9363a..942f9363a 100644
--- a/ubuntu/maverick/tdelibs/debian/man/kshell-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/kshell-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/ksvgtopng-trinity.1 b/ubuntu/_base/tdelibs/debian/man/ksvgtopng-trinity.1
index 45c779776..45c779776 100644
--- a/ubuntu/maverick/tdelibs/debian/man/ksvgtopng-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/ksvgtopng-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/lnusertemp-trinity.sgml
index 7951fcc6f..7951fcc6f 100644
--- a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/lnusertemp-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1 b/ubuntu/_base/tdelibs/debian/man/make_driver_db_cups-trinity.1
index d93921c98..d93921c98 100644
--- a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_cups-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/make_driver_db_cups-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_lpr-trinity.1 b/ubuntu/_base/tdelibs/debian/man/make_driver_db_lpr-trinity.1
index 61493ba06..61493ba06 100644
--- a/ubuntu/maverick/tdelibs/debian/man/make_driver_db_lpr-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/make_driver_db_lpr-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/maketdewidgets-trinity.1 b/ubuntu/_base/tdelibs/debian/man/maketdewidgets-trinity.1
index 7bf32e767..7bf32e767 100644
--- a/ubuntu/maverick/tdelibs/debian/man/maketdewidgets-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/maketdewidgets-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/meinproc-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/meinproc-trinity.sgml
index 83ac2654a..83ac2654a 100644
--- a/ubuntu/maverick/tdelibs/debian/man/meinproc-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/meinproc-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/preparetips-trinity.1 b/ubuntu/_base/tdelibs/debian/man/preparetips-trinity.1
index 6f598433b..6f598433b 100644
--- a/ubuntu/maverick/tdelibs/debian/man/preparetips-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/preparetips-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tde-config-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/tde-config-trinity.sgml
index 0a6da2268..0a6da2268 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tde-config-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/tde-config-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/tde-menu-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tde-menu-trinity.1
index c9ae5c1b7..c9ae5c1b7 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tde-menu-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tde-menu-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeab2tdeabc-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdeab2tdeabc-trinity.1
index 5d2267278..5d2267278 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeab2tdeabc-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdeab2tdeabc-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdebuildsycoca-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
index dadd26284..dadd26284 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/tdebuildsycoca-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdecmshell-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdecmshell-trinity.1
index 055cbdd68..055cbdd68 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdecmshell-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdecmshell-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeconf_update-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/tdeconf_update-trinity.sgml
index 475aa6eca..475aa6eca 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeconf_update-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/tdeconf_update-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeconfig_compiler-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdeconfig_compiler-trinity.1
index e7aba95e6..e7aba95e6 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeconfig_compiler-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdeconfig_compiler-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdefile-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/tdefile-trinity.sgml
index 17a94d0f1..17a94d0f1 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdefile-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/tdefile-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdehotnewstuff-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdehotnewstuff-trinity.1
index d8ddbed80..d8ddbed80 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdehotnewstuff-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdehotnewstuff-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdeinit-trinity.1
index c591fc245..c591fc245 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdeinit-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeinit_shutdown-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdeinit_shutdown-trinity.1
index 95a20cfa9..95a20cfa9 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeinit_shutdown-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdeinit_shutdown-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeio_http_cache_cleaner-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/tdeio_http_cache_cleaner-trinity.sgml
index 3062176d3..3062176d3 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeio_http_cache_cleaner-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/tdeio_http_cache_cleaner-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeio_uiserver-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
index d15b8f3a2..d15b8f3a2 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/tdeio_uiserver-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeioexec-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdeioexec-trinity.1
index e07194181..e07194181 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeioexec-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdeioexec-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdelauncher-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdelauncher-trinity.1
index 7a49a662d..7a49a662d 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdelauncher-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdelauncher-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdemailservice-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/tdemailservice-trinity.sgml
index 2ed6db99f..2ed6db99f 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdemailservice-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/tdemailservice-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdesendbugmail-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/tdesendbugmail-trinity.sgml
index 7c15ce6d2..7c15ce6d2 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdesendbugmail-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/tdesendbugmail-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdestartupconfig-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdestartupconfig-trinity.1
index 4f0f6c6e2..4f0f6c6e2 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdestartupconfig-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdestartupconfig-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdesu_stub-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdesu_stub-trinity.1
index 02573d970..02573d970 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdesu_stub-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdesu_stub-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdetelnetservice-trinity.sgml b/ubuntu/_base/tdelibs/debian/man/tdetelnetservice-trinity.sgml
index 6552840fe..6552840fe 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdetelnetservice-trinity.sgml
+++ b/ubuntu/_base/tdelibs/debian/man/tdetelnetservice-trinity.sgml
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdetradertest-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdetradertest-trinity.1
index f1ff4599a..f1ff4599a 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdetradertest-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdetradertest-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeunittestmodrunner-trinity.1 b/ubuntu/_base/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
index c271869b8..c271869b8 100644
--- a/ubuntu/maverick/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
+++ b/ubuntu/_base/tdelibs/debian/man/tdeunittestmodrunner-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/not-installed.list b/ubuntu/_base/tdelibs/debian/not-installed.list
index 4355d4fbd..4355d4fbd 100644
--- a/ubuntu/maverick/tdelibs/debian/not-installed.list
+++ b/ubuntu/_base/tdelibs/debian/not-installed.list
diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/_base/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
index 184591207..184591207 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
+++ b/ubuntu/_base/tdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
diff --git a/ubuntu/maverick/tdelibs/debian/patches/series b/ubuntu/_base/tdelibs/debian/patches/series
index b5490e13d..b5490e13d 100644
--- a/ubuntu/maverick/tdelibs/debian/patches/series
+++ b/ubuntu/_base/tdelibs/debian/patches/series
diff --git a/ubuntu/maverick/tdelibs/debian/prune-nonfree b/ubuntu/_base/tdelibs/debian/prune-nonfree
index c6121e836..c6121e836 100644
--- a/ubuntu/maverick/tdelibs/debian/prune-nonfree
+++ b/ubuntu/_base/tdelibs/debian/prune-nonfree
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/_base/tdelibs/debian/rules
index 17a3ffda4..17a3ffda4 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/_base/tdelibs/debian/rules
diff --git a/ubuntu/maverick/tdelibs/debian/source/format b/ubuntu/_base/tdelibs/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdelibs/debian/source/format
+++ b/ubuntu/_base/tdelibs/debian/source/format
diff --git a/ubuntu/maverick/tdelibs/debian/source/options b/ubuntu/_base/tdelibs/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdelibs/debian/source/options
+++ b/ubuntu/_base/tdelibs/debian/source/options
diff --git a/ubuntu/maverick/tdelibs/debian/tdecmshell b/ubuntu/_base/tdelibs/debian/tdecmshell
index 64dea7e87..64dea7e87 100755
--- a/ubuntu/maverick/tdelibs/debian/tdecmshell
+++ b/ubuntu/_base/tdelibs/debian/tdecmshell
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.install
index 74f6b8d3f..74f6b8d3f 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.install
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.links
index 3b0f1cdf4..3b0f1cdf4 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links
+++ b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.links
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.postinst b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.postinst
index f2a8d925b..f2a8d925b 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.postinst
+++ b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.postinst
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.postrm b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.postrm
index aae9f3600..aae9f3600 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.postrm
+++ b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.postrm
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.preinst
index c6c9c016f..c6c9c016f 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.preinst
+++ b/ubuntu/_base/tdelibs/debian/tdelibs-data-trinity.preinst
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-trinity.presubj b/ubuntu/_base/tdelibs/debian/tdelibs-trinity.presubj
index fa80ec621..fa80ec621 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-trinity.presubj
+++ b/ubuntu/_base/tdelibs/debian/tdelibs-trinity.presubj
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.docs b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity-dev.docs
index 3d802584c..3d802584c 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.docs
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity-dev.docs
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity-dev.install
index 73c87967b..73c87967b 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.install
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity-dev.install
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.manpages b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity-dev.manpages
index 5f13f5b3f..5f13f5b3f 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-dev.manpages
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity-dev.manpages
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-doc.install b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity-doc.install
index 71ae7f63f..71ae7f63f 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity-doc.install
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity-doc.install
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.docs b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.docs
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.docs
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.install
index b54ca2e2f..b54ca2e2f 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.install
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.install
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.lintian b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.lintian
index 6272877c3..6272877c3 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.lintian
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.lintian
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.manpages b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.manpages
index 7c2d23170..7c2d23170 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.manpages
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.manpages
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.postinst b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.postinst
index 6dbf5d9e1..6dbf5d9e1 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.postinst
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.postinst
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.presubj b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.presubj
index fa80ec621..fa80ec621 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs14-trinity.presubj
+++ b/ubuntu/_base/tdelibs/debian/tdelibs14-trinity.presubj
diff --git a/ubuntu/maverick/tdelibs/debian/trinitylibs.conf b/ubuntu/_base/tdelibs/debian/trinitylibs.conf
index 4158c0679..4158c0679 100644
--- a/ubuntu/maverick/tdelibs/debian/trinitylibs.conf
+++ b/ubuntu/_base/tdelibs/debian/trinitylibs.conf
diff --git a/ubuntu/maverick/tdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/_base/tdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
index b643a5ee2..b643a5ee2 100644
--- a/ubuntu/maverick/tdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/_base/tdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.install b/ubuntu/_base/tdemultimedia/debian/artsbuilder-trinity.install
index badda9a18..badda9a18 100644
--- a/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/artsbuilder-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.menu b/ubuntu/_base/tdemultimedia/debian/artsbuilder-trinity.menu
index e8eed049c..e8eed049c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/artsbuilder-trinity.menu
+++ b/ubuntu/_base/tdemultimedia/debian/artsbuilder-trinity.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index 14dce59aa..14dce59aa 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdemultimedia/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk b/ubuntu/_base/tdemultimedia/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdemultimedia/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/versions.pl b/ubuntu/_base/tdemultimedia/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdemultimedia/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdemultimedia/debian/changelog b/ubuntu/_base/tdemultimedia/debian/changelog
index d3ae62e7a..d3ae62e7a 100644
--- a/ubuntu/maverick/tdemultimedia/debian/changelog
+++ b/ubuntu/_base/tdemultimedia/debian/changelog
diff --git a/ubuntu/maverick/tdemultimedia/debian/compat b/ubuntu/_base/tdemultimedia/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdemultimedia/debian/compat
+++ b/ubuntu/_base/tdemultimedia/debian/compat
diff --git a/ubuntu/maverick/tdemultimedia/debian/control b/ubuntu/_base/tdemultimedia/debian/control
index a61267298..a61267298 100644
--- a/ubuntu/maverick/tdemultimedia/debian/control
+++ b/ubuntu/_base/tdemultimedia/debian/control
diff --git a/ubuntu/maverick/tdemultimedia/debian/copyright b/ubuntu/_base/tdemultimedia/debian/copyright
index 42b700d89..42b700d89 100644
--- a/ubuntu/maverick/tdemultimedia/debian/copyright
+++ b/ubuntu/_base/tdemultimedia/debian/copyright
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/artsbuilder.xpm b/ubuntu/_base/tdemultimedia/debian/icons/artsbuilder.xpm
index 8f5bd016b..8f5bd016b 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/artsbuilder.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/artsbuilder.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/artscontrol.xpm b/ubuntu/_base/tdemultimedia/debian/icons/artscontrol.xpm
index b37b1e650..b37b1e650 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/artscontrol.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/artscontrol.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/juk-16.xpm b/ubuntu/_base/tdemultimedia/debian/icons/juk-16.xpm
index 2b17c6068..2b17c6068 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/juk-16.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/juk-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/juk.xpm b/ubuntu/_base/tdemultimedia/debian/icons/juk.xpm
index 30498a68b..30498a68b 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/juk.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/juk.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kaboodle-16.xpm b/ubuntu/_base/tdemultimedia/debian/icons/kaboodle-16.xpm
index 4f4184dd1..4f4184dd1 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kaboodle-16.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/kaboodle-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kaboodle.xpm b/ubuntu/_base/tdemultimedia/debian/icons/kaboodle.xpm
index ab04a15f2..ab04a15f2 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kaboodle.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/kaboodle.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kaudiocreator-16.xpm b/ubuntu/_base/tdemultimedia/debian/icons/kaudiocreator-16.xpm
index 50b98352c..50b98352c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kaudiocreator-16.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/kaudiocreator-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kaudiocreator.xpm b/ubuntu/_base/tdemultimedia/debian/icons/kaudiocreator.xpm
index 223436043..223436043 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kaudiocreator.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/kaudiocreator.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kmix-16.xpm b/ubuntu/_base/tdemultimedia/debian/icons/kmix-16.xpm
index 58c2b675d..58c2b675d 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kmix-16.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/kmix-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kmix.xpm b/ubuntu/_base/tdemultimedia/debian/icons/kmix.xpm
index 0c04abfc8..0c04abfc8 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kmix.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/kmix.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/krec-16.xpm b/ubuntu/_base/tdemultimedia/debian/icons/krec-16.xpm
index 9db4ba58e..9db4ba58e 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/krec-16.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/krec-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/krec.xpm b/ubuntu/_base/tdemultimedia/debian/icons/krec.xpm
index 108634685..108634685 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/krec.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/krec.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kscd-16.xpm b/ubuntu/_base/tdemultimedia/debian/icons/kscd-16.xpm
index 8e279b754..8e279b754 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kscd-16.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/kscd-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/kscd.xpm b/ubuntu/_base/tdemultimedia/debian/icons/kscd.xpm
index b21878949..b21878949 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/kscd.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/kscd.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/noatun-16.xpm b/ubuntu/_base/tdemultimedia/debian/icons/noatun-16.xpm
index fe4639857..fe4639857 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/noatun-16.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/noatun-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/noatun.xpm b/ubuntu/_base/tdemultimedia/debian/icons/noatun.xpm
index 10c085be5..10c085be5 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/noatun.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/noatun.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/tdemid-16.xpm b/ubuntu/_base/tdemultimedia/debian/icons/tdemid-16.xpm
index 64ad03b59..64ad03b59 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/tdemid-16.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/tdemid-16.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/icons/tdemid.xpm b/ubuntu/_base/tdemultimedia/debian/icons/tdemid.xpm
index c4cbb3bf1..c4cbb3bf1 100644
--- a/ubuntu/maverick/tdemultimedia/debian/icons/tdemid.xpm
+++ b/ubuntu/_base/tdemultimedia/debian/icons/tdemid.xpm
diff --git a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.install b/ubuntu/_base/tdemultimedia/debian/juk-trinity.install
index b3b2e7b91..b3b2e7b91 100644
--- a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/juk-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.manpages b/ubuntu/_base/tdemultimedia/debian/juk-trinity.manpages
index cc1b91a74..cc1b91a74 100644
--- a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.manpages
+++ b/ubuntu/_base/tdemultimedia/debian/juk-trinity.manpages
diff --git a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.menu b/ubuntu/_base/tdemultimedia/debian/juk-trinity.menu
index 459902f1f..459902f1f 100644
--- a/ubuntu/maverick/tdemultimedia/debian/juk-trinity.menu
+++ b/ubuntu/_base/tdemultimedia/debian/juk-trinity.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.install b/ubuntu/_base/tdemultimedia/debian/kaboodle-trinity.install
index e16be8952..e16be8952 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/kaboodle-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.manpages b/ubuntu/_base/tdemultimedia/debian/kaboodle-trinity.manpages
index 56aa78551..56aa78551 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.manpages
+++ b/ubuntu/_base/tdemultimedia/debian/kaboodle-trinity.manpages
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.menu b/ubuntu/_base/tdemultimedia/debian/kaboodle-trinity.menu
index 9791f632c..9791f632c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaboodle-trinity.menu
+++ b/ubuntu/_base/tdemultimedia/debian/kaboodle-trinity.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install b/ubuntu/_base/tdemultimedia/debian/kaudiocreator-trinity.install
index 4569bbf20..4569bbf20 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/kaudiocreator-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.manpages b/ubuntu/_base/tdemultimedia/debian/kaudiocreator-trinity.manpages
index e3f09d6dd..e3f09d6dd 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.manpages
+++ b/ubuntu/_base/tdemultimedia/debian/kaudiocreator-trinity.manpages
diff --git a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.menu b/ubuntu/_base/tdemultimedia/debian/kaudiocreator-trinity.menu
index 91b9a6848..91b9a6848 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kaudiocreator-trinity.menu
+++ b/ubuntu/_base/tdemultimedia/debian/kaudiocreator-trinity.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install b/ubuntu/_base/tdemultimedia/debian/kmix-trinity.install
index fd8ea15e1..fd8ea15e1 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/kmix-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/_base/tdemultimedia/debian/kmix-trinity.lintian
index c802a5b07..c802a5b07 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/_base/tdemultimedia/debian/kmix-trinity.lintian
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.manpages b/ubuntu/_base/tdemultimedia/debian/kmix-trinity.manpages
index e0adce8b6..e0adce8b6 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.manpages
+++ b/ubuntu/_base/tdemultimedia/debian/kmix-trinity.manpages
diff --git a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.menu b/ubuntu/_base/tdemultimedia/debian/kmix-trinity.menu
index 36993f3b9..36993f3b9 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.menu
+++ b/ubuntu/_base/tdemultimedia/debian/kmix-trinity.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install b/ubuntu/_base/tdemultimedia/debian/krec-trinity.install
index 40832458b..40832458b 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/krec-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/_base/tdemultimedia/debian/krec-trinity.lintian
index 9cba1f36a..9cba1f36a 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/_base/tdemultimedia/debian/krec-trinity.lintian
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.manpages b/ubuntu/_base/tdemultimedia/debian/krec-trinity.manpages
index 8a59c57a8..8a59c57a8 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.manpages
+++ b/ubuntu/_base/tdemultimedia/debian/krec-trinity.manpages
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.menu b/ubuntu/_base/tdemultimedia/debian/krec-trinity.menu
index c5aa31173..c5aa31173 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.menu
+++ b/ubuntu/_base/tdemultimedia/debian/krec-trinity.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.install b/ubuntu/_base/tdemultimedia/debian/kscd-trinity.install
index ee9ba581d..ee9ba581d 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/kscd-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.menu b/ubuntu/_base/tdemultimedia/debian/kscd-trinity.menu
index 03d4a5e47..03d4a5e47 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kscd-trinity.menu
+++ b/ubuntu/_base/tdemultimedia/debian/kscd-trinity.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/libarts1-akode-trinity.install b/ubuntu/_base/tdemultimedia/debian/libarts1-akode-trinity.install
index 99a987715..99a987715 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libarts1-akode-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/libarts1-akode-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/libarts1-audiofile-trinity.install b/ubuntu/_base/tdemultimedia/debian/libarts1-audiofile-trinity.install
index cb2eba97a..cb2eba97a 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libarts1-audiofile-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/libarts1-audiofile-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/libarts1-audiofile-trinity.lintian b/ubuntu/_base/tdemultimedia/debian/libarts1-audiofile-trinity.lintian
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libarts1-audiofile-trinity.lintian
+++ b/ubuntu/_base/tdemultimedia/debian/libarts1-audiofile-trinity.lintian
diff --git a/ubuntu/maverick/tdemultimedia/debian/libarts1-mpeglib-trinity.install b/ubuntu/_base/tdemultimedia/debian/libarts1-mpeglib-trinity.install
index a4728ea10..a4728ea10 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libarts1-mpeglib-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/libarts1-mpeglib-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.install b/ubuntu/_base/tdemultimedia/debian/libarts1-xine-trinity.install
index ab89af340..ab89af340 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/libarts1-xine-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian b/ubuntu/_base/tdemultimedia/debian/libarts1-xine-trinity.lintian
index ef72447cf..ef72447cf 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/ubuntu/_base/tdemultimedia/debian/libarts1-xine-trinity.lintian
diff --git a/ubuntu/maverick/tdemultimedia/debian/libkcddb1-trinity.install b/ubuntu/_base/tdemultimedia/debian/libkcddb1-trinity.install
index b1ffb9a1c..b1ffb9a1c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libkcddb1-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/libkcddb1-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/juk-trinity.1 b/ubuntu/_base/tdemultimedia/debian/man/juk-trinity.1
index 0981892b5..0981892b5 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/juk-trinity.1
+++ b/ubuntu/_base/tdemultimedia/debian/man/juk-trinity.1
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/_base/tdemultimedia/debian/man/kaboodle-trinity.1
index 13745bc95..13745bc95 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kaboodle-trinity.1
+++ b/ubuntu/_base/tdemultimedia/debian/man/kaboodle-trinity.1
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kaudiocreator-trinity.1 b/ubuntu/_base/tdemultimedia/debian/man/kaudiocreator-trinity.1
index 35600bcda..35600bcda 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kaudiocreator-trinity.1
+++ b/ubuntu/_base/tdemultimedia/debian/man/kaudiocreator-trinity.1
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kmix-trinity.1 b/ubuntu/_base/tdemultimedia/debian/man/kmix-trinity.1
index e603facb3..e603facb3 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kmix-trinity.1
+++ b/ubuntu/_base/tdemultimedia/debian/man/kmix-trinity.1
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/kmixctrl-trinity.1 b/ubuntu/_base/tdemultimedia/debian/man/kmixctrl-trinity.1
index 58a586b18..58a586b18 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/kmixctrl-trinity.1
+++ b/ubuntu/_base/tdemultimedia/debian/man/kmixctrl-trinity.1
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/krec-trinity.1 b/ubuntu/_base/tdemultimedia/debian/man/krec-trinity.1
index 9e2c57e3c..9e2c57e3c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/krec-trinity.1
+++ b/ubuntu/_base/tdemultimedia/debian/man/krec-trinity.1
diff --git a/ubuntu/maverick/tdemultimedia/debian/man/noatun-trinity.1 b/ubuntu/_base/tdemultimedia/debian/man/noatun-trinity.1
index 1ed42ae02..1ed42ae02 100644
--- a/ubuntu/maverick/tdemultimedia/debian/man/noatun-trinity.1
+++ b/ubuntu/_base/tdemultimedia/debian/man/noatun-trinity.1
diff --git a/ubuntu/maverick/tdemultimedia/debian/mpeglib-trinity.install b/ubuntu/_base/tdemultimedia/debian/mpeglib-trinity.install
index c1340ecff..c1340ecff 100644
--- a/ubuntu/maverick/tdemultimedia/debian/mpeglib-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/mpeglib-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.install
index e5adf0383..e5adf0383 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.lintian
index 834dbc664..834dbc664 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
+++ b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.lintian
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.manpages b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.manpages
index e5196f799..e5196f799 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.manpages
+++ b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.manpages
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.menu b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.menu
index 62e70362b..62e70362b 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.menu
+++ b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.mime b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.mime
index 4b757de3d..4b757de3d 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.mime
+++ b/ubuntu/_base/tdemultimedia/debian/noatun-trinity.mime
diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdemultimedia/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdemultimedia/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdemultimedia/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/series b/ubuntu/_base/tdemultimedia/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdemultimedia/debian/patches/series
+++ b/ubuntu/_base/tdemultimedia/debian/patches/series
diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/_base/tdemultimedia/debian/rules
index 39ec27d1f..39ec27d1f 100755
--- a/ubuntu/maverick/tdemultimedia/debian/rules
+++ b/ubuntu/_base/tdemultimedia/debian/rules
diff --git a/ubuntu/maverick/tdemultimedia/debian/source/format b/ubuntu/_base/tdemultimedia/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdemultimedia/debian/source/format
+++ b/ubuntu/_base/tdemultimedia/debian/source/format
diff --git a/ubuntu/maverick/tdemultimedia/debian/source/options b/ubuntu/_base/tdemultimedia/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdemultimedia/debian/source/options
+++ b/ubuntu/_base/tdemultimedia/debian/source/options
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.install b/ubuntu/_base/tdemultimedia/debian/tdemid-trinity.install
index c36f2d16a..c36f2d16a 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/tdemid-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu b/ubuntu/_base/tdemultimedia/debian/tdemid-trinity.menu
index 210d049f7..210d049f7 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemid-trinity.menu
+++ b/ubuntu/_base/tdemultimedia/debian/tdemid-trinity.menu
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder
index 22dec6526..22dec6526 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.artsbuilder
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk
index 4d56243c2..4d56243c2 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.juk
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
index 292148961..292148961 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kaboodle
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix
index cf57cbde4..cf57cbde4 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kmix
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
index ffc9dc616..ffc9dc616 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.krec
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
index 6a8d63c70..6a8d63c70 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.kscd
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
index f27d836e4..f27d836e4 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.noatun
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
index 9d12a9c46..9d12a9c46 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-doc-html.doc-base.tdemid
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install
index 9ca50ed2e..9ca50ed2e 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-kappfinder-data-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
index 13381df12..13381df12 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-tdefile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install
index f8c5086c4..f8c5086c4 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-tdeio-plugins-trinity.install
diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index 17fd1301f..17fd1301f 100644
--- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/ubuntu/_base/tdemultimedia/debian/tdemultimedia-trinity-dev.install
diff --git a/ubuntu/maverick/tdenetwork/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/_base/tdenetwork/debian/KUBUNTU-DEBIAN-CHANGES
index fd40ff787..fd40ff787 100644
--- a/ubuntu/maverick/tdenetwork/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/_base/tdenetwork/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdenetwork/debian/cdbs/debian-qt-kde.mk
index 14dce59aa..14dce59aa 100644
--- a/ubuntu/maverick/tdenetwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdenetwork/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk b/ubuntu/_base/tdenetwork/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdenetwork/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/versions.pl b/ubuntu/_base/tdenetwork/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdenetwork/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdenetwork/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdenetwork/debian/changelog b/ubuntu/_base/tdenetwork/debian/changelog
index 9a3af2560..9a3af2560 100644
--- a/ubuntu/maverick/tdenetwork/debian/changelog
+++ b/ubuntu/_base/tdenetwork/debian/changelog
diff --git a/ubuntu/maverick/tdenetwork/debian/compat b/ubuntu/_base/tdenetwork/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdenetwork/debian/compat
+++ b/ubuntu/_base/tdenetwork/debian/compat
diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/_base/tdenetwork/debian/control
index 07a3e14be..07a3e14be 100644
--- a/ubuntu/maverick/tdenetwork/debian/control
+++ b/ubuntu/_base/tdenetwork/debian/control
diff --git a/ubuntu/maverick/tdenetwork/debian/copyright b/ubuntu/_base/tdenetwork/debian/copyright
index 1bcb3d62c..1bcb3d62c 100644
--- a/ubuntu/maverick/tdenetwork/debian/copyright
+++ b/ubuntu/_base/tdenetwork/debian/copyright
diff --git a/ubuntu/maverick/tdenetwork/debian/dcoprss-trinity.install b/ubuntu/_base/tdenetwork/debian/dcoprss-trinity.install
index a167af8da..a167af8da 100644
--- a/ubuntu/maverick/tdenetwork/debian/dcoprss-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/dcoprss-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kdict-16.xpm b/ubuntu/_base/tdenetwork/debian/icons/kdict-16.xpm
index 19fecc4ff..19fecc4ff 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kdict-16.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kdict-16.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kdict.xpm b/ubuntu/_base/tdenetwork/debian/icons/kdict.xpm
index d0efc5cd1..d0efc5cd1 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kdict.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kdict.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kget-16.xpm b/ubuntu/_base/tdenetwork/debian/icons/kget-16.xpm
index e51ad05d9..e51ad05d9 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kget-16.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kget-16.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kget.xpm b/ubuntu/_base/tdenetwork/debian/icons/kget.xpm
index 79ed2262b..79ed2262b 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kget.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kget.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/knewsticker-16.xpm b/ubuntu/_base/tdenetwork/debian/icons/knewsticker-16.xpm
index aea3d8556..aea3d8556 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/knewsticker-16.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/knewsticker-16.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/knewsticker.xpm b/ubuntu/_base/tdenetwork/debian/icons/knewsticker.xpm
index 05030698a..05030698a 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/knewsticker.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/knewsticker.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kopete-16.xpm b/ubuntu/_base/tdenetwork/debian/icons/kopete-16.xpm
index b9ccda679..b9ccda679 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kopete-16.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kopete-16.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kopete.xpm b/ubuntu/_base/tdenetwork/debian/icons/kopete.xpm
index e996e096c..e996e096c 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kopete.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kopete.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kppp-16.xpm b/ubuntu/_base/tdenetwork/debian/icons/kppp-16.xpm
index 4bff6468d..4bff6468d 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kppp-16.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kppp-16.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kppp.xpm b/ubuntu/_base/tdenetwork/debian/icons/kppp.xpm
index 59b7f6823..59b7f6823 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kppp.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kppp.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/krdc-16.xpm b/ubuntu/_base/tdenetwork/debian/icons/krdc-16.xpm
index 0def168ad..0def168ad 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/krdc-16.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/krdc-16.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/krdc.xpm b/ubuntu/_base/tdenetwork/debian/icons/krdc.xpm
index 4ec5687cc..4ec5687cc 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/krdc.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/krdc.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/krfb-16.xpm b/ubuntu/_base/tdenetwork/debian/icons/krfb-16.xpm
index 469b0e91d..469b0e91d 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/krfb-16.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/krfb-16.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/krfb.xpm b/ubuntu/_base/tdenetwork/debian/icons/krfb.xpm
index 99bdfb1a0..99bdfb1a0 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/krfb.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/krfb.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/ksirc-16.xpm b/ubuntu/_base/tdenetwork/debian/icons/ksirc-16.xpm
index 3fdde4854..3fdde4854 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/ksirc-16.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/ksirc-16.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/ksirc.xpm b/ubuntu/_base/tdenetwork/debian/icons/ksirc.xpm
index 0e52bbec6..0e52bbec6 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/ksirc.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/ksirc.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kwifimanager-16.xpm b/ubuntu/_base/tdenetwork/debian/icons/kwifimanager-16.xpm
index c2e8390ae..c2e8390ae 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kwifimanager-16.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kwifimanager-16.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/icons/kwifimanager.xpm b/ubuntu/_base/tdenetwork/debian/icons/kwifimanager.xpm
index 8ed3c8790..8ed3c8790 100644
--- a/ubuntu/maverick/tdenetwork/debian/icons/kwifimanager.xpm
+++ b/ubuntu/_base/tdenetwork/debian/icons/kwifimanager.xpm
diff --git a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install b/ubuntu/_base/tdenetwork/debian/kdict-trinity.install
index 7d57f12cf..7d57f12cf 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/kdict-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.manpages b/ubuntu/_base/tdenetwork/debian/kdict-trinity.manpages
index 3128a0e9a..3128a0e9a 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.manpages
+++ b/ubuntu/_base/tdenetwork/debian/kdict-trinity.manpages
diff --git a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.menu b/ubuntu/_base/tdenetwork/debian/kdict-trinity.menu
index f197e5837..f197e5837 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.menu
+++ b/ubuntu/_base/tdenetwork/debian/kdict-trinity.menu
diff --git a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.postinst b/ubuntu/_base/tdenetwork/debian/kdict-trinity.postinst
index 5076ff321..5076ff321 100644
--- a/ubuntu/maverick/tdenetwork/debian/kdict-trinity.postinst
+++ b/ubuntu/_base/tdenetwork/debian/kdict-trinity.postinst
diff --git a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install b/ubuntu/_base/tdenetwork/debian/kget-trinity.install
index d2a0707c9..d2a0707c9 100644
--- a/ubuntu/maverick/tdenetwork/debian/kget-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/kget-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/kget-trinity.manpages b/ubuntu/_base/tdenetwork/debian/kget-trinity.manpages
index 585b03129..585b03129 100644
--- a/ubuntu/maverick/tdenetwork/debian/kget-trinity.manpages
+++ b/ubuntu/_base/tdenetwork/debian/kget-trinity.manpages
diff --git a/ubuntu/maverick/tdenetwork/debian/kget-trinity.menu b/ubuntu/_base/tdenetwork/debian/kget-trinity.menu
index a31274964..a31274964 100644
--- a/ubuntu/maverick/tdenetwork/debian/kget-trinity.menu
+++ b/ubuntu/_base/tdenetwork/debian/kget-trinity.menu
diff --git a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.install b/ubuntu/_base/tdenetwork/debian/knewsticker-trinity.install
index a424a10a5..a424a10a5 100644
--- a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/knewsticker-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian b/ubuntu/_base/tdenetwork/debian/knewsticker-trinity.lintian
index 566329697..566329697 100644
--- a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian
+++ b/ubuntu/_base/tdenetwork/debian/knewsticker-trinity.lintian
diff --git a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.menu b/ubuntu/_base/tdenetwork/debian/knewsticker-trinity.menu
index d0e19697f..d0e19697f 100644
--- a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.menu
+++ b/ubuntu/_base/tdenetwork/debian/knewsticker-trinity.menu
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install b/ubuntu/_base/tdenetwork/debian/kopete-trinity.install
index c1c334101..c1c334101 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/kopete-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.manpages b/ubuntu/_base/tdenetwork/debian/kopete-trinity.manpages
index 214a24d2e..214a24d2e 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.manpages
+++ b/ubuntu/_base/tdenetwork/debian/kopete-trinity.manpages
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu b/ubuntu/_base/tdenetwork/debian/kopete-trinity.menu
index 7a1e9b981..7a1e9b981 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu
+++ b/ubuntu/_base/tdenetwork/debian/kopete-trinity.menu
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.postinst b/ubuntu/_base/tdenetwork/debian/kopete-trinity.postinst
index f1f83b298..f1f83b298 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.postinst
+++ b/ubuntu/_base/tdenetwork/debian/kopete-trinity.postinst
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.prerm b/ubuntu/_base/tdenetwork/debian/kopete-trinity.prerm
index 4ee2b5d9d..4ee2b5d9d 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.prerm
+++ b/ubuntu/_base/tdenetwork/debian/kopete-trinity.prerm
diff --git a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.presubj b/ubuntu/_base/tdenetwork/debian/kopete-trinity.presubj
index b818709fb..b818709fb 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.presubj
+++ b/ubuntu/_base/tdenetwork/debian/kopete-trinity.presubj
diff --git a/ubuntu/maverick/tdenetwork/debian/kpf-trinity.install b/ubuntu/_base/tdenetwork/debian/kpf-trinity.install
index 34db30cb4..34db30cb4 100644
--- a/ubuntu/maverick/tdenetwork/debian/kpf-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/kpf-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.README.Debian b/ubuntu/_base/tdenetwork/debian/kppp-trinity.README.Debian
index 8602c6647..8602c6647 100644
--- a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.README.Debian
+++ b/ubuntu/_base/tdenetwork/debian/kppp-trinity.README.Debian
diff --git a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install b/ubuntu/_base/tdenetwork/debian/kppp-trinity.install
index 7c2f9d141..7c2f9d141 100644
--- a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/kppp-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian b/ubuntu/_base/tdenetwork/debian/kppp-trinity.lintian
index 5a3a22357..5a3a22357 100644
--- a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian
+++ b/ubuntu/_base/tdenetwork/debian/kppp-trinity.lintian
diff --git a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.menu b/ubuntu/_base/tdenetwork/debian/kppp-trinity.menu
index b2d3a1433..b2d3a1433 100644
--- a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.menu
+++ b/ubuntu/_base/tdenetwork/debian/kppp-trinity.menu
diff --git a/ubuntu/maverick/tdenetwork/debian/krdc-trinity.install b/ubuntu/_base/tdenetwork/debian/krdc-trinity.install
index c98bcd373..c98bcd373 100644
--- a/ubuntu/maverick/tdenetwork/debian/krdc-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/krdc-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/krdc-trinity.menu b/ubuntu/_base/tdenetwork/debian/krdc-trinity.menu
index cf09c9d57..cf09c9d57 100644
--- a/ubuntu/maverick/tdenetwork/debian/krdc-trinity.menu
+++ b/ubuntu/_base/tdenetwork/debian/krdc-trinity.menu
diff --git a/ubuntu/maverick/tdenetwork/debian/krfb-trinity.install b/ubuntu/_base/tdenetwork/debian/krfb-trinity.install
index 618ff882d..618ff882d 100644
--- a/ubuntu/maverick/tdenetwork/debian/krfb-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/krfb-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/krfb-trinity.menu b/ubuntu/_base/tdenetwork/debian/krfb-trinity.menu
index b42ac0fd7..b42ac0fd7 100644
--- a/ubuntu/maverick/tdenetwork/debian/krfb-trinity.menu
+++ b/ubuntu/_base/tdenetwork/debian/krfb-trinity.menu
diff --git a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install b/ubuntu/_base/tdenetwork/debian/ksirc-trinity.install
index 440ee00e9..440ee00e9 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/ksirc-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian b/ubuntu/_base/tdenetwork/debian/ksirc-trinity.lintian
index f219b1176..f219b1176 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/_base/tdenetwork/debian/ksirc-trinity.lintian
diff --git a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu b/ubuntu/_base/tdenetwork/debian/ksirc-trinity.menu
index 2984e56bd..2984e56bd 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu
+++ b/ubuntu/_base/tdenetwork/debian/ksirc-trinity.menu
diff --git a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.postinst b/ubuntu/_base/tdenetwork/debian/ksirc-trinity.postinst
index 1ee118baa..1ee118baa 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.postinst
+++ b/ubuntu/_base/tdenetwork/debian/ksirc-trinity.postinst
diff --git a/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.install b/ubuntu/_base/tdenetwork/debian/ktalkd-trinity.install
index 91bb7d3c8..91bb7d3c8 100644
--- a/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/ktalkd-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.postinst b/ubuntu/_base/tdenetwork/debian/ktalkd-trinity.postinst
index 44dfd6c24..44dfd6c24 100644
--- a/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.postinst
+++ b/ubuntu/_base/tdenetwork/debian/ktalkd-trinity.postinst
diff --git a/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.postrm b/ubuntu/_base/tdenetwork/debian/ktalkd-trinity.postrm
index 6c2b34cdc..6c2b34cdc 100644
--- a/ubuntu/maverick/tdenetwork/debian/ktalkd-trinity.postrm
+++ b/ubuntu/_base/tdenetwork/debian/ktalkd-trinity.postrm
diff --git a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.install b/ubuntu/_base/tdenetwork/debian/kwifimanager-trinity.install
index 328c9ae44..328c9ae44 100644
--- a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/kwifimanager-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/_base/tdenetwork/debian/kwifimanager-trinity.lintian
index 1586f0f0a..1586f0f0a 100644
--- a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/ubuntu/_base/tdenetwork/debian/kwifimanager-trinity.lintian
diff --git a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.manpages b/ubuntu/_base/tdenetwork/debian/kwifimanager-trinity.manpages
index 4f390510b..4f390510b 100644
--- a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.manpages
+++ b/ubuntu/_base/tdenetwork/debian/kwifimanager-trinity.manpages
diff --git a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.menu b/ubuntu/_base/tdenetwork/debian/kwifimanager-trinity.menu
index e71041a4f..e71041a4f 100644
--- a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.menu
+++ b/ubuntu/_base/tdenetwork/debian/kwifimanager-trinity.menu
diff --git a/ubuntu/maverick/tdenetwork/debian/librss1-trinity.install b/ubuntu/_base/tdenetwork/debian/librss1-trinity.install
index d16201611..d16201611 100644
--- a/ubuntu/maverick/tdenetwork/debian/librss1-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/librss1-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.docs b/ubuntu/_base/tdenetwork/debian/lisa-trinity.docs
index 2a33a726f..2a33a726f 100644
--- a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.docs
+++ b/ubuntu/_base/tdenetwork/debian/lisa-trinity.docs
diff --git a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.init b/ubuntu/_base/tdenetwork/debian/lisa-trinity.init
index 1551c0e1e..1551c0e1e 100644
--- a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.init
+++ b/ubuntu/_base/tdenetwork/debian/lisa-trinity.init
diff --git a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install b/ubuntu/_base/tdenetwork/debian/lisa-trinity.install
index 728eed390..728eed390 100644
--- a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/lisa-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.manpages b/ubuntu/_base/tdenetwork/debian/lisa-trinity.manpages
index 306f0c52e..306f0c52e 100644
--- a/ubuntu/maverick/tdenetwork/debian/lisa-trinity.manpages
+++ b/ubuntu/_base/tdenetwork/debian/lisa-trinity.manpages
diff --git a/ubuntu/maverick/tdenetwork/debian/lisarc b/ubuntu/_base/tdenetwork/debian/lisarc
index 27a0c5f08..27a0c5f08 100644
--- a/ubuntu/maverick/tdenetwork/debian/lisarc
+++ b/ubuntu/_base/tdenetwork/debian/lisarc
diff --git a/ubuntu/maverick/tdenetwork/debian/man/kdict-trinity.1 b/ubuntu/_base/tdenetwork/debian/man/kdict-trinity.1
index aff5138c4..aff5138c4 100644
--- a/ubuntu/maverick/tdenetwork/debian/man/kdict-trinity.1
+++ b/ubuntu/_base/tdenetwork/debian/man/kdict-trinity.1
diff --git a/ubuntu/maverick/tdenetwork/debian/man/kget-trinity.1 b/ubuntu/_base/tdenetwork/debian/man/kget-trinity.1
index 72b2d3305..72b2d3305 100644
--- a/ubuntu/maverick/tdenetwork/debian/man/kget-trinity.1
+++ b/ubuntu/_base/tdenetwork/debian/man/kget-trinity.1
diff --git a/ubuntu/maverick/tdenetwork/debian/man/kopete-trinity.sgml b/ubuntu/_base/tdenetwork/debian/man/kopete-trinity.sgml
index 87922999d..87922999d 100644
--- a/ubuntu/maverick/tdenetwork/debian/man/kopete-trinity.sgml
+++ b/ubuntu/_base/tdenetwork/debian/man/kopete-trinity.sgml
diff --git a/ubuntu/maverick/tdenetwork/debian/man/kwifimanager-trinity.1 b/ubuntu/_base/tdenetwork/debian/man/kwifimanager-trinity.1
index 5f12be561..5f12be561 100644
--- a/ubuntu/maverick/tdenetwork/debian/man/kwifimanager-trinity.1
+++ b/ubuntu/_base/tdenetwork/debian/man/kwifimanager-trinity.1
diff --git a/ubuntu/maverick/tdenetwork/debian/man/lisa-trinity.8 b/ubuntu/_base/tdenetwork/debian/man/lisa-trinity.8
index 9b3192e14..9b3192e14 100644
--- a/ubuntu/maverick/tdenetwork/debian/man/lisa-trinity.8
+++ b/ubuntu/_base/tdenetwork/debian/man/lisa-trinity.8
diff --git a/ubuntu/maverick/tdenetwork/debian/man/reslisa-trinity.8 b/ubuntu/_base/tdenetwork/debian/man/reslisa-trinity.8
index eb2ca8f48..eb2ca8f48 100644
--- a/ubuntu/maverick/tdenetwork/debian/man/reslisa-trinity.8
+++ b/ubuntu/_base/tdenetwork/debian/man/reslisa-trinity.8
diff --git a/ubuntu/maverick/tdenetwork/debian/not-installed.list b/ubuntu/_base/tdenetwork/debian/not-installed.list
index f73944ef7..f73944ef7 100644
--- a/ubuntu/maverick/tdenetwork/debian/not-installed.list
+++ b/ubuntu/_base/tdenetwork/debian/not-installed.list
diff --git a/ubuntu/maverick/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdenetwork/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdenetwork/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdenetwork/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdenetwork/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdenetwork/debian/patches/series b/ubuntu/_base/tdenetwork/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdenetwork/debian/patches/series
+++ b/ubuntu/_base/tdenetwork/debian/patches/series
diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/_base/tdenetwork/debian/rules
index 1b04a16ea..1b04a16ea 100755
--- a/ubuntu/maverick/tdenetwork/debian/rules
+++ b/ubuntu/_base/tdenetwork/debian/rules
diff --git a/ubuntu/maverick/tdenetwork/debian/source/format b/ubuntu/_base/tdenetwork/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdenetwork/debian/source/format
+++ b/ubuntu/_base/tdenetwork/debian/source/format
diff --git a/ubuntu/maverick/tdenetwork/debian/source/options b/ubuntu/_base/tdenetwork/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdenetwork/debian/source/options
+++ b/ubuntu/_base/tdenetwork/debian/source/options
diff --git a/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install b/ubuntu/_base/tdenetwork/debian/tdednssd-trinity.install
index 46b3c424c..46b3c424c 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdednssd-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/tdednssd-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict
index 8cd75880f..8cd75880f 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kdict
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget
index 0e5e6bd35..0e5e6bd35 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kget
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker
index 55d1a2611..55d1a2611 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.knewsticker
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete
index 918b2fff4..918b2fff4 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kopete
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf
index 71a6af2c2..71a6af2c2 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kpf
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp
index 47a8a02ee..47a8a02ee 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kppp
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc
index 41f38f4db..41f38f4db 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.krdc
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb
index dbfec7252..dbfec7252 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.krfb
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc
index c530cffa1..c530cffa1 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.ksirc
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd
index ea9219292..ea9219292 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.ktalkd
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager
index 8d2ad13da..8d2ad13da 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.kwifimanager
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa
index aace7f520..aace7f520 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-doc-html.doc-base.lisa
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-filesharing-trinity.install b/ubuntu/_base/tdenetwork/debian/tdenetwork-filesharing-trinity.install
index 4bbdfcb9a..4bbdfcb9a 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-filesharing-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-filesharing-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install b/ubuntu/_base/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install
index fef93a0b0..fef93a0b0 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-tdefile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/_base/tdenetwork/debian/tdenetwork-trinity-dev.install
index 62a1a419a..62a1a419a 100644
--- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/ubuntu/_base/tdenetwork/debian/tdenetwork-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 1a164878c..1a164878c 100644
--- a/ubuntu/maverick/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdepim/debian/akregator-trinity.install b/ubuntu/_base/tdepim/debian/akregator-trinity.install
index 0110b9760..0110b9760 100644
--- a/ubuntu/maverick/tdepim/debian/akregator-trinity.install
+++ b/ubuntu/_base/tdepim/debian/akregator-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/akregator-trinity.manpages b/ubuntu/_base/tdepim/debian/akregator-trinity.manpages
index 04a056c6e..04a056c6e 100644
--- a/ubuntu/maverick/tdepim/debian/akregator-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/akregator-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/akregator-trinity.menu b/ubuntu/_base/tdepim/debian/akregator-trinity.menu
index 3614c2f89..3614c2f89 100644
--- a/ubuntu/maverick/tdepim/debian/akregator-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/akregator-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/bits/fcntl.h b/ubuntu/_base/tdepim/debian/bits/fcntl.h
index 342a533f1..342a533f1 100644
--- a/ubuntu/maverick/tdepim/debian/bits/fcntl.h
+++ b/ubuntu/_base/tdepim/debian/bits/fcntl.h
diff --git a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdepim/debian/cdbs/debian-qt-kde.mk
index 3bd77b8f7..3bd77b8f7 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdepim/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdepim/debian/cdbs/kde.mk b/ubuntu/_base/tdepim/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdepim/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdepim/debian/cdbs/versions.pl b/ubuntu/_base/tdepim/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdepim/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdepim/debian/changelog b/ubuntu/_base/tdepim/debian/changelog
index 313f2e913..313f2e913 100644
--- a/ubuntu/maverick/tdepim/debian/changelog
+++ b/ubuntu/_base/tdepim/debian/changelog
diff --git a/ubuntu/maverick/tdepim/debian/compat b/ubuntu/_base/tdepim/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdepim/debian/compat
+++ b/ubuntu/_base/tdepim/debian/compat
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/_base/tdepim/debian/control
index beb057470..beb057470 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/_base/tdepim/debian/control
diff --git a/ubuntu/maverick/tdepim/debian/copyright b/ubuntu/_base/tdepim/debian/copyright
index 340c4d607..340c4d607 100644
--- a/ubuntu/maverick/tdepim/debian/copyright
+++ b/ubuntu/_base/tdepim/debian/copyright
diff --git a/ubuntu/maverick/tdepim/debian/icons/akregator-16.xpm b/ubuntu/_base/tdepim/debian/icons/akregator-16.xpm
index 598317ae7..598317ae7 100644
--- a/ubuntu/maverick/tdepim/debian/icons/akregator-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/akregator-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/akregator.xpm b/ubuntu/_base/tdepim/debian/icons/akregator.xpm
index aaa0b5fe8..aaa0b5fe8 100644
--- a/ubuntu/maverick/tdepim/debian/icons/akregator.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/akregator.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kaddressbook-16.xpm b/ubuntu/_base/tdepim/debian/icons/kaddressbook-16.xpm
index 3ac635289..3ac635289 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kaddressbook-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kaddressbook-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kaddressbook.xpm b/ubuntu/_base/tdepim/debian/icons/kaddressbook.xpm
index 337082f14..337082f14 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kaddressbook.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kaddressbook.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kalarm-16.xpm b/ubuntu/_base/tdepim/debian/icons/kalarm-16.xpm
index 7ad36a097..7ad36a097 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kalarm-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kalarm-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kalarm.xpm b/ubuntu/_base/tdepim/debian/icons/kalarm.xpm
index 0b1e62950..0b1e62950 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kalarm.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kalarm.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kandy-16.xpm b/ubuntu/_base/tdepim/debian/icons/kandy-16.xpm
index 9d2361ce2..9d2361ce2 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kandy-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kandy-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kandy.xpm b/ubuntu/_base/tdepim/debian/icons/kandy.xpm
index 78fc91d9a..78fc91d9a 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kandy.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kandy.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/karm-16.xpm b/ubuntu/_base/tdepim/debian/icons/karm-16.xpm
index cddfe0e76..cddfe0e76 100644
--- a/ubuntu/maverick/tdepim/debian/icons/karm-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/karm-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/karm.xpm b/ubuntu/_base/tdepim/debian/icons/karm.xpm
index 38f832c9a..38f832c9a 100644
--- a/ubuntu/maverick/tdepim/debian/icons/karm.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/karm.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kmail-16.xpm b/ubuntu/_base/tdepim/debian/icons/kmail-16.xpm
index a387d347f..a387d347f 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kmail-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kmail-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kmail.xpm b/ubuntu/_base/tdepim/debian/icons/kmail.xpm
index dc0d1a689..dc0d1a689 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kmail.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kmail.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kmailcvt-16.xpm b/ubuntu/_base/tdepim/debian/icons/kmailcvt-16.xpm
index 1ab4abd6c..1ab4abd6c 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kmailcvt-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kmailcvt-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kmailcvt.xpm b/ubuntu/_base/tdepim/debian/icons/kmailcvt.xpm
index 25da3a69a..25da3a69a 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kmailcvt.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kmailcvt.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/knode-16.xpm b/ubuntu/_base/tdepim/debian/icons/knode-16.xpm
index 60516c0d6..60516c0d6 100644
--- a/ubuntu/maverick/tdepim/debian/icons/knode-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/knode-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/knode.xpm b/ubuntu/_base/tdepim/debian/icons/knode.xpm
index b0e8361ad..b0e8361ad 100644
--- a/ubuntu/maverick/tdepim/debian/icons/knode.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/knode.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/knotes-16.xpm b/ubuntu/_base/tdepim/debian/icons/knotes-16.xpm
index 0daa3ecfa..0daa3ecfa 100644
--- a/ubuntu/maverick/tdepim/debian/icons/knotes-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/knotes-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/knotes.xpm b/ubuntu/_base/tdepim/debian/icons/knotes.xpm
index 8c96be652..8c96be652 100644
--- a/ubuntu/maverick/tdepim/debian/icons/knotes.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/knotes.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kontact-16.xpm b/ubuntu/_base/tdepim/debian/icons/kontact-16.xpm
index 4332e2cc0..4332e2cc0 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kontact-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kontact-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kontact.xpm b/ubuntu/_base/tdepim/debian/icons/kontact.xpm
index 1b5e038b5..1b5e038b5 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kontact.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kontact.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/korganizer-16.xpm b/ubuntu/_base/tdepim/debian/icons/korganizer-16.xpm
index 5bba2637c..5bba2637c 100644
--- a/ubuntu/maverick/tdepim/debian/icons/korganizer-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/korganizer-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/korganizer.xpm b/ubuntu/_base/tdepim/debian/icons/korganizer.xpm
index 66693bfbb..66693bfbb 100644
--- a/ubuntu/maverick/tdepim/debian/icons/korganizer.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/korganizer.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/korn-16.xpm b/ubuntu/_base/tdepim/debian/icons/korn-16.xpm
index 33f993fb2..33f993fb2 100644
--- a/ubuntu/maverick/tdepim/debian/icons/korn-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/korn-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/korn.xpm b/ubuntu/_base/tdepim/debian/icons/korn.xpm
index cb518223e..cb518223e 100644
--- a/ubuntu/maverick/tdepim/debian/icons/korn.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/korn.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kpalmdoc-16.xpm b/ubuntu/_base/tdepim/debian/icons/kpalmdoc-16.xpm
index 714032360..714032360 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kpalmdoc-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kpalmdoc-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kpalmdoc.xpm b/ubuntu/_base/tdepim/debian/icons/kpalmdoc.xpm
index 02521e56f..02521e56f 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kpalmdoc.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kpalmdoc.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kpilot-16.xpm b/ubuntu/_base/tdepim/debian/icons/kpilot-16.xpm
index 25fe904f2..25fe904f2 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kpilot-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kpilot-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/kpilot.xpm b/ubuntu/_base/tdepim/debian/icons/kpilot.xpm
index b4f7a7aa0..b4f7a7aa0 100644
--- a/ubuntu/maverick/tdepim/debian/icons/kpilot.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/kpilot.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/ksync-16.xpm b/ubuntu/_base/tdepim/debian/icons/ksync-16.xpm
index 46518a787..46518a787 100644
--- a/ubuntu/maverick/tdepim/debian/icons/ksync-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/ksync-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/ksync.xpm b/ubuntu/_base/tdepim/debian/icons/ksync.xpm
index cb7727237..cb7727237 100644
--- a/ubuntu/maverick/tdepim/debian/icons/ksync.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/ksync.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/ktnef-16.xpm b/ubuntu/_base/tdepim/debian/icons/ktnef-16.xpm
index a387d347f..a387d347f 100644
--- a/ubuntu/maverick/tdepim/debian/icons/ktnef-16.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/ktnef-16.xpm
diff --git a/ubuntu/maverick/tdepim/debian/icons/ktnef.xpm b/ubuntu/_base/tdepim/debian/icons/ktnef.xpm
index dc0d1a689..dc0d1a689 100644
--- a/ubuntu/maverick/tdepim/debian/icons/ktnef.xpm
+++ b/ubuntu/_base/tdepim/debian/icons/ktnef.xpm
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install b/ubuntu/_base/tdepim/debian/kaddressbook-trinity.install
index 82a8dd9c4..82a8dd9c4 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.install
+++ b/ubuntu/_base/tdepim/debian/kaddressbook-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.links b/ubuntu/_base/tdepim/debian/kaddressbook-trinity.links
index 8a98675cc..8a98675cc 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.links
+++ b/ubuntu/_base/tdepim/debian/kaddressbook-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.manpages b/ubuntu/_base/tdepim/debian/kaddressbook-trinity.manpages
index 7c9dccab5..7c9dccab5 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/kaddressbook-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu b/ubuntu/_base/tdepim/debian/kaddressbook-trinity.menu
index f5a20268a..f5a20268a 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/kaddressbook-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/kalarm-trinity.install b/ubuntu/_base/tdepim/debian/kalarm-trinity.install
index ab01f0bcd..ab01f0bcd 100644
--- a/ubuntu/maverick/tdepim/debian/kalarm-trinity.install
+++ b/ubuntu/_base/tdepim/debian/kalarm-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kalarm-trinity.links b/ubuntu/_base/tdepim/debian/kalarm-trinity.links
index 436bd4cca..436bd4cca 100644
--- a/ubuntu/maverick/tdepim/debian/kalarm-trinity.links
+++ b/ubuntu/_base/tdepim/debian/kalarm-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/kalarm-trinity.manpages b/ubuntu/_base/tdepim/debian/kalarm-trinity.manpages
index 5be431fd7..5be431fd7 100644
--- a/ubuntu/maverick/tdepim/debian/kalarm-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/kalarm-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu b/ubuntu/_base/tdepim/debian/kalarm-trinity.menu
index 51f8a28cc..51f8a28cc 100644
--- a/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/kalarm-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/kandy-trinity.install b/ubuntu/_base/tdepim/debian/kandy-trinity.install
index bf356be2c..bf356be2c 100644
--- a/ubuntu/maverick/tdepim/debian/kandy-trinity.install
+++ b/ubuntu/_base/tdepim/debian/kandy-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kandy-trinity.links b/ubuntu/_base/tdepim/debian/kandy-trinity.links
index f2d49c8a3..f2d49c8a3 100644
--- a/ubuntu/maverick/tdepim/debian/kandy-trinity.links
+++ b/ubuntu/_base/tdepim/debian/kandy-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/kandy-trinity.manpages b/ubuntu/_base/tdepim/debian/kandy-trinity.manpages
index 03554768f..03554768f 100644
--- a/ubuntu/maverick/tdepim/debian/kandy-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/kandy-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kandy-trinity.menu b/ubuntu/_base/tdepim/debian/kandy-trinity.menu
index 1e09fc9f5..1e09fc9f5 100644
--- a/ubuntu/maverick/tdepim/debian/kandy-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/kandy-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/karm-trinity.install b/ubuntu/_base/tdepim/debian/karm-trinity.install
index 855a03b27..855a03b27 100644
--- a/ubuntu/maverick/tdepim/debian/karm-trinity.install
+++ b/ubuntu/_base/tdepim/debian/karm-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/karm-trinity.links b/ubuntu/_base/tdepim/debian/karm-trinity.links
index 7ea1d2f25..7ea1d2f25 100644
--- a/ubuntu/maverick/tdepim/debian/karm-trinity.links
+++ b/ubuntu/_base/tdepim/debian/karm-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/karm-trinity.manpages b/ubuntu/_base/tdepim/debian/karm-trinity.manpages
index 0ae3f04a8..0ae3f04a8 100644
--- a/ubuntu/maverick/tdepim/debian/karm-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/karm-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/karm-trinity.menu b/ubuntu/_base/tdepim/debian/karm-trinity.menu
index 1d7ae61a0..1d7ae61a0 100644
--- a/ubuntu/maverick/tdepim/debian/karm-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/karm-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.install b/ubuntu/_base/tdepim/debian/kitchensync-trinity.install
index f22298aae..f22298aae 100644
--- a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.install
+++ b/ubuntu/_base/tdepim/debian/kitchensync-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.manpages b/ubuntu/_base/tdepim/debian/kitchensync-trinity.manpages
index f921c8c0e..f921c8c0e 100644
--- a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/kitchensync-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.menu b/ubuntu/_base/tdepim/debian/kitchensync-trinity.menu
index 7630b49d8..7630b49d8 100644
--- a/ubuntu/maverick/tdepim/debian/kitchensync-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/kitchensync-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.install b/ubuntu/_base/tdepim/debian/kleopatra-trinity.install
index 8e1ffa046..8e1ffa046 100644
--- a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.install
+++ b/ubuntu/_base/tdepim/debian/kleopatra-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.links b/ubuntu/_base/tdepim/debian/kleopatra-trinity.links
index 89f636dcd..89f636dcd 100644
--- a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.links
+++ b/ubuntu/_base/tdepim/debian/kleopatra-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.manpages b/ubuntu/_base/tdepim/debian/kleopatra-trinity.manpages
index 37a8fdc2f..37a8fdc2f 100644
--- a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/kleopatra-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.menu b/ubuntu/_base/tdepim/debian/kleopatra-trinity.menu
index 60e2714db..60e2714db 100644
--- a/ubuntu/maverick/tdepim/debian/kleopatra-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/kleopatra-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/kmail-trinity.install b/ubuntu/_base/tdepim/debian/kmail-trinity.install
index a26f45d79..a26f45d79 100644
--- a/ubuntu/maverick/tdepim/debian/kmail-trinity.install
+++ b/ubuntu/_base/tdepim/debian/kmail-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kmail-trinity.links b/ubuntu/_base/tdepim/debian/kmail-trinity.links
index 21e8a877a..21e8a877a 100644
--- a/ubuntu/maverick/tdepim/debian/kmail-trinity.links
+++ b/ubuntu/_base/tdepim/debian/kmail-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/kmail-trinity.manpages b/ubuntu/_base/tdepim/debian/kmail-trinity.manpages
index 5a5b3a51e..5a5b3a51e 100644
--- a/ubuntu/maverick/tdepim/debian/kmail-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/kmail-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kmail-trinity.menu b/ubuntu/_base/tdepim/debian/kmail-trinity.menu
index fcee72213..fcee72213 100644
--- a/ubuntu/maverick/tdepim/debian/kmail-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/kmail-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/kmail.NEWS b/ubuntu/_base/tdepim/debian/kmail.NEWS
index 730bd58b1..730bd58b1 100644
--- a/ubuntu/maverick/tdepim/debian/kmail.NEWS
+++ b/ubuntu/_base/tdepim/debian/kmail.NEWS
diff --git a/ubuntu/maverick/tdepim/debian/kmail.README.Debian b/ubuntu/_base/tdepim/debian/kmail.README.Debian
index 9737546e2..9737546e2 100644
--- a/ubuntu/maverick/tdepim/debian/kmail.README.Debian
+++ b/ubuntu/_base/tdepim/debian/kmail.README.Debian
diff --git a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.install b/ubuntu/_base/tdepim/debian/kmailcvt-trinity.install
index 967e8fd24..967e8fd24 100644
--- a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.install
+++ b/ubuntu/_base/tdepim/debian/kmailcvt-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.manpages b/ubuntu/_base/tdepim/debian/kmailcvt-trinity.manpages
index 4eb8c2067..4eb8c2067 100644
--- a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/kmailcvt-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu b/ubuntu/_base/tdepim/debian/kmailcvt-trinity.menu
index 964c7ecec..964c7ecec 100644
--- a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/kmailcvt-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/knode-trinity.install b/ubuntu/_base/tdepim/debian/knode-trinity.install
index a807a9711..a807a9711 100644
--- a/ubuntu/maverick/tdepim/debian/knode-trinity.install
+++ b/ubuntu/_base/tdepim/debian/knode-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/knode-trinity.links b/ubuntu/_base/tdepim/debian/knode-trinity.links
index 61dd05e51..61dd05e51 100644
--- a/ubuntu/maverick/tdepim/debian/knode-trinity.links
+++ b/ubuntu/_base/tdepim/debian/knode-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/knode-trinity.manpages b/ubuntu/_base/tdepim/debian/knode-trinity.manpages
index 72c9b5b9b..72c9b5b9b 100644
--- a/ubuntu/maverick/tdepim/debian/knode-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/knode-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/knode-trinity.menu b/ubuntu/_base/tdepim/debian/knode-trinity.menu
index 46d857c93..46d857c93 100644
--- a/ubuntu/maverick/tdepim/debian/knode-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/knode-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.install b/ubuntu/_base/tdepim/debian/knotes-trinity.install
index 8f65af5e3..8f65af5e3 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.install
+++ b/ubuntu/_base/tdepim/debian/knotes-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.links b/ubuntu/_base/tdepim/debian/knotes-trinity.links
index 1ba2fa093..1ba2fa093 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.links
+++ b/ubuntu/_base/tdepim/debian/knotes-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.manpages b/ubuntu/_base/tdepim/debian/knotes-trinity.manpages
index ef942a499..ef942a499 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/knotes-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.menu b/ubuntu/_base/tdepim/debian/knotes-trinity.menu
index 51a0e0ca5..51a0e0ca5 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/knotes-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.preinst b/ubuntu/_base/tdepim/debian/knotes-trinity.preinst
index a56aa3945..a56aa3945 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.preinst
+++ b/ubuntu/_base/tdepim/debian/knotes-trinity.preinst
diff --git a/ubuntu/maverick/tdepim/debian/kode-trinity.install b/ubuntu/_base/tdepim/debian/kode-trinity.install
index 2097cf80b..2097cf80b 100644
--- a/ubuntu/maverick/tdepim/debian/kode-trinity.install
+++ b/ubuntu/_base/tdepim/debian/kode-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kode-trinity.manpages b/ubuntu/_base/tdepim/debian/kode-trinity.manpages
index 0c947e5fb..0c947e5fb 100644
--- a/ubuntu/maverick/tdepim/debian/kode-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/kode-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.install b/ubuntu/_base/tdepim/debian/konsolekalendar-trinity.install
index f46c301bc..f46c301bc 100644
--- a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.install
+++ b/ubuntu/_base/tdepim/debian/konsolekalendar-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.links b/ubuntu/_base/tdepim/debian/konsolekalendar-trinity.links
index 423b5c172..423b5c172 100644
--- a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.links
+++ b/ubuntu/_base/tdepim/debian/konsolekalendar-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.manpages b/ubuntu/_base/tdepim/debian/konsolekalendar-trinity.manpages
index 8af64605b..8af64605b 100644
--- a/ubuntu/maverick/tdepim/debian/konsolekalendar-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/konsolekalendar-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kontact-trinity.install b/ubuntu/_base/tdepim/debian/kontact-trinity.install
index 1adfd780c..1adfd780c 100644
--- a/ubuntu/maverick/tdepim/debian/kontact-trinity.install
+++ b/ubuntu/_base/tdepim/debian/kontact-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/kontact-trinity.links b/ubuntu/_base/tdepim/debian/kontact-trinity.links
index 9f0e2beff..9f0e2beff 100644
--- a/ubuntu/maverick/tdepim/debian/kontact-trinity.links
+++ b/ubuntu/_base/tdepim/debian/kontact-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/kontact-trinity.manpages b/ubuntu/_base/tdepim/debian/kontact-trinity.manpages
index a2900a879..a2900a879 100644
--- a/ubuntu/maverick/tdepim/debian/kontact-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/kontact-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/kontact-trinity.menu b/ubuntu/_base/tdepim/debian/kontact-trinity.menu
index 671f98668..671f98668 100644
--- a/ubuntu/maverick/tdepim/debian/kontact-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/kontact-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/korganizer-trinity.install b/ubuntu/_base/tdepim/debian/korganizer-trinity.install
index bf83660e5..bf83660e5 100644
--- a/ubuntu/maverick/tdepim/debian/korganizer-trinity.install
+++ b/ubuntu/_base/tdepim/debian/korganizer-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/korganizer-trinity.links b/ubuntu/_base/tdepim/debian/korganizer-trinity.links
index 608fc7441..608fc7441 100644
--- a/ubuntu/maverick/tdepim/debian/korganizer-trinity.links
+++ b/ubuntu/_base/tdepim/debian/korganizer-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/korganizer-trinity.manpages b/ubuntu/_base/tdepim/debian/korganizer-trinity.manpages
index 64d6e1199..64d6e1199 100644
--- a/ubuntu/maverick/tdepim/debian/korganizer-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/korganizer-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu b/ubuntu/_base/tdepim/debian/korganizer-trinity.menu
index aed196972..aed196972 100644
--- a/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/korganizer-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/korn-trinity.install b/ubuntu/_base/tdepim/debian/korn-trinity.install
index 324cc90d4..324cc90d4 100644
--- a/ubuntu/maverick/tdepim/debian/korn-trinity.install
+++ b/ubuntu/_base/tdepim/debian/korn-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/korn-trinity.links b/ubuntu/_base/tdepim/debian/korn-trinity.links
index 915338e25..915338e25 100644
--- a/ubuntu/maverick/tdepim/debian/korn-trinity.links
+++ b/ubuntu/_base/tdepim/debian/korn-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/korn-trinity.manpages b/ubuntu/_base/tdepim/debian/korn-trinity.manpages
index 7a67836ba..7a67836ba 100644
--- a/ubuntu/maverick/tdepim/debian/korn-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/korn-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/korn-trinity.menu b/ubuntu/_base/tdepim/debian/korn-trinity.menu
index 2c656f159..2c656f159 100644
--- a/ubuntu/maverick/tdepim/debian/korn-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/korn-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/ktnef-trinity.install b/ubuntu/_base/tdepim/debian/ktnef-trinity.install
index 5964289ef..5964289ef 100644
--- a/ubuntu/maverick/tdepim/debian/ktnef-trinity.install
+++ b/ubuntu/_base/tdepim/debian/ktnef-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/ktnef-trinity.links b/ubuntu/_base/tdepim/debian/ktnef-trinity.links
index c93eb29f5..c93eb29f5 100644
--- a/ubuntu/maverick/tdepim/debian/ktnef-trinity.links
+++ b/ubuntu/_base/tdepim/debian/ktnef-trinity.links
diff --git a/ubuntu/maverick/tdepim/debian/ktnef-trinity.manpages b/ubuntu/_base/tdepim/debian/ktnef-trinity.manpages
index 7a8886ac6..7a8886ac6 100644
--- a/ubuntu/maverick/tdepim/debian/ktnef-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/ktnef-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu b/ubuntu/_base/tdepim/debian/ktnef-trinity.menu
index 38f214033..38f214033 100644
--- a/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/ktnef-trinity.menu
diff --git a/ubuntu/maverick/tdepim/debian/ktnef-trinity.mime b/ubuntu/_base/tdepim/debian/ktnef-trinity.mime
index 35a952194..35a952194 100644
--- a/ubuntu/maverick/tdepim/debian/ktnef-trinity.mime
+++ b/ubuntu/_base/tdepim/debian/ktnef-trinity.mime
diff --git a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.docs b/ubuntu/_base/tdepim/debian/libindex0-trinity-dev.docs
index 8db46472b..8db46472b 100644
--- a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.docs
+++ b/ubuntu/_base/tdepim/debian/libindex0-trinity-dev.docs
diff --git a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install b/ubuntu/_base/tdepim/debian/libindex0-trinity-dev.install
index 6e84a12b1..6e84a12b1 100644
--- a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install
+++ b/ubuntu/_base/tdepim/debian/libindex0-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/libindex0-trinity.install b/ubuntu/_base/tdepim/debian/libindex0-trinity.install
index 2a278e4fe..2a278e4fe 100644
--- a/ubuntu/maverick/tdepim/debian/libindex0-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libindex0-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install b/ubuntu/_base/tdepim/debian/libkgantt0-trinity-dev.install
index e042469fa..e042469fa 100644
--- a/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install
+++ b/ubuntu/_base/tdepim/debian/libkgantt0-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/libkgantt0-trinity.install b/ubuntu/_base/tdepim/debian/libkgantt0-trinity.install
index d3cf0216a..d3cf0216a 100644
--- a/ubuntu/maverick/tdepim/debian/libkgantt0-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libkgantt0-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install b/ubuntu/_base/tdepim/debian/libkleopatra1-trinity-dev.install
index 6ac5db793..6ac5db793 100644
--- a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install
+++ b/ubuntu/_base/tdepim/debian/libkleopatra1-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity.install b/ubuntu/_base/tdepim/debian/libkleopatra1-trinity.install
index ec394bea0..ec394bea0 100644
--- a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libkleopatra1-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/libkmime2-trinity.install b/ubuntu/_base/tdepim/debian/libkmime2-trinity.install
index ef3533fbe..ef3533fbe 100644
--- a/ubuntu/maverick/tdepim/debian/libkmime2-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libkmime2-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install b/ubuntu/_base/tdepim/debian/libkpimexchange1-trinity-dev.install
index 416036a0d..416036a0d 100644
--- a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install
+++ b/ubuntu/_base/tdepim/debian/libkpimexchange1-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity.install b/ubuntu/_base/tdepim/debian/libkpimexchange1-trinity.install
index f5b098575..f5b098575 100644
--- a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libkpimexchange1-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/libkpimidentities1-trinity.install b/ubuntu/_base/tdepim/debian/libkpimidentities1-trinity.install
index 156f7036c..156f7036c 100644
--- a/ubuntu/maverick/tdepim/debian/libkpimidentities1-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libkpimidentities1-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install b/ubuntu/_base/tdepim/debian/libksieve0-trinity-dev.install
index 2f74cc12f..2f74cc12f 100644
--- a/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install
+++ b/ubuntu/_base/tdepim/debian/libksieve0-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/libksieve0-trinity.install b/ubuntu/_base/tdepim/debian/libksieve0-trinity.install
index 3e139e6b2..3e139e6b2 100644
--- a/ubuntu/maverick/tdepim/debian/libksieve0-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libksieve0-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install b/ubuntu/_base/tdepim/debian/libktnef1-trinity-dev.install
index 03b67df5b..03b67df5b 100644
--- a/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install
+++ b/ubuntu/_base/tdepim/debian/libktnef1-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/libktnef1-trinity.install b/ubuntu/_base/tdepim/debian/libktnef1-trinity.install
index b956b9b12..b956b9b12 100644
--- a/ubuntu/maverick/tdepim/debian/libktnef1-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libktnef1-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install b/ubuntu/_base/tdepim/debian/libmimelib1-trinity-dev.install
index d843ad5b8..d843ad5b8 100644
--- a/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install
+++ b/ubuntu/_base/tdepim/debian/libmimelib1-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/libmimelib1c2a-trinity.install b/ubuntu/_base/tdepim/debian/libmimelib1c2a-trinity.install
index 3d4feb108..3d4feb108 100644
--- a/ubuntu/maverick/tdepim/debian/libmimelib1c2a-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libmimelib1c2a-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install b/ubuntu/_base/tdepim/debian/libtdepim1-trinity-dev.install
index 632541749..632541749 100644
--- a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install
+++ b/ubuntu/_base/tdepim/debian/libtdepim1-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install b/ubuntu/_base/tdepim/debian/libtdepim1a-trinity.install
index 9e52e618f..9e52e618f 100644
--- a/ubuntu/maverick/tdepim/debian/libtdepim1a-trinity.install
+++ b/ubuntu/_base/tdepim/debian/libtdepim1a-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/man/akregator-trinity.man b/ubuntu/_base/tdepim/debian/man/akregator-trinity.man
index cfbdd3348..cfbdd3348 100644
--- a/ubuntu/maverick/tdepim/debian/man/akregator-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/akregator-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/egroupwarewizard-trinity.man b/ubuntu/_base/tdepim/debian/man/egroupwarewizard-trinity.man
index 2c6168cf3..2c6168cf3 100644
--- a/ubuntu/maverick/tdepim/debian/man/egroupwarewizard-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/egroupwarewizard-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/exchangewizard-trinity.man b/ubuntu/_base/tdepim/debian/man/exchangewizard-trinity.man
index d077615f7..d077615f7 100644
--- a/ubuntu/maverick/tdepim/debian/man/exchangewizard-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/exchangewizard-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/groupwarewizard-trinity.man b/ubuntu/_base/tdepim/debian/man/groupwarewizard-trinity.man
index bddeed88e..bddeed88e 100644
--- a/ubuntu/maverick/tdepim/debian/man/groupwarewizard-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/groupwarewizard-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/groupwisewizard-trinity.man b/ubuntu/_base/tdepim/debian/man/groupwisewizard-trinity.man
index 2bc201407..2bc201407 100644
--- a/ubuntu/maverick/tdepim/debian/man/groupwisewizard-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/groupwisewizard-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/ical2vcal-trinity.man b/ubuntu/_base/tdepim/debian/man/ical2vcal-trinity.man
index d6adbaa01..d6adbaa01 100644
--- a/ubuntu/maverick/tdepim/debian/man/ical2vcal-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/ical2vcal-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man b/ubuntu/_base/tdepim/debian/man/kaddressbook-trinity.man
index 36fad6734..36fad6734 100644
--- a/ubuntu/maverick/tdepim/debian/man/kaddressbook-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kaddressbook-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kalarm-trinity.man b/ubuntu/_base/tdepim/debian/man/kalarm-trinity.man
index 8aa59cc00..8aa59cc00 100644
--- a/ubuntu/maverick/tdepim/debian/man/kalarm-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kalarm-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kalarmd-trinity.man b/ubuntu/_base/tdepim/debian/man/kalarmd-trinity.man
index 051966dad..051966dad 100644
--- a/ubuntu/maverick/tdepim/debian/man/kalarmd-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kalarmd-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kandy-trinity.man b/ubuntu/_base/tdepim/debian/man/kandy-trinity.man
index 7f9d06c5f..7f9d06c5f 100644
--- a/ubuntu/maverick/tdepim/debian/man/kandy-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kandy-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kandy_client-trinity.man b/ubuntu/_base/tdepim/debian/man/kandy_client-trinity.man
index f36552f67..f36552f67 100644
--- a/ubuntu/maverick/tdepim/debian/man/kandy_client-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kandy_client-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/karm-trinity.man b/ubuntu/_base/tdepim/debian/man/karm-trinity.man
index 18a1d52d3..18a1d52d3 100644
--- a/ubuntu/maverick/tdepim/debian/man/karm-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/karm-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kdeopt.part b/ubuntu/_base/tdepim/debian/man/kdeopt.part
index 661b4591d..661b4591d 100644
--- a/ubuntu/maverick/tdepim/debian/man/kdeopt.part
+++ b/ubuntu/_base/tdepim/debian/man/kdeopt.part
diff --git a/ubuntu/maverick/tdepim/debian/man/kitchensync-trinity.man b/ubuntu/_base/tdepim/debian/man/kitchensync-trinity.man
index 548ca86ee..548ca86ee 100644
--- a/ubuntu/maverick/tdepim/debian/man/kitchensync-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kitchensync-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kleopatra-trinity.man b/ubuntu/_base/tdepim/debian/man/kleopatra-trinity.man
index 67123a5b2..67123a5b2 100644
--- a/ubuntu/maverick/tdepim/debian/man/kleopatra-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kleopatra-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kmail-trinity.man b/ubuntu/_base/tdepim/debian/man/kmail-trinity.man
index dbeebae4d..dbeebae4d 100644
--- a/ubuntu/maverick/tdepim/debian/man/kmail-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kmail-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kmail_antivir.sh-trinity.man b/ubuntu/_base/tdepim/debian/man/kmail_antivir.sh-trinity.man
index 53b347173..53b347173 100644
--- a/ubuntu/maverick/tdepim/debian/man/kmail_antivir.sh-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kmail_antivir.sh-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kmail_clamav.sh-trinity.man b/ubuntu/_base/tdepim/debian/man/kmail_clamav.sh-trinity.man
index 90cd51899..90cd51899 100644
--- a/ubuntu/maverick/tdepim/debian/man/kmail_clamav.sh-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kmail_clamav.sh-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kmail_fprot.sh-trinity.man b/ubuntu/_base/tdepim/debian/man/kmail_fprot.sh-trinity.man
index e44a2ee6a..e44a2ee6a 100644
--- a/ubuntu/maverick/tdepim/debian/man/kmail_fprot.sh-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kmail_fprot.sh-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kmail_sav.sh-trinity.man b/ubuntu/_base/tdepim/debian/man/kmail_sav.sh-trinity.man
index 64eb01ab6..64eb01ab6 100644
--- a/ubuntu/maverick/tdepim/debian/man/kmail_sav.sh-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kmail_sav.sh-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kmailcvt-trinity.man b/ubuntu/_base/tdepim/debian/man/kmailcvt-trinity.man
index fc3c482c5..fc3c482c5 100644
--- a/ubuntu/maverick/tdepim/debian/man/kmailcvt-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kmailcvt-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/knode-trinity.man b/ubuntu/_base/tdepim/debian/man/knode-trinity.man
index e4efa97f2..e4efa97f2 100644
--- a/ubuntu/maverick/tdepim/debian/man/knode-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/knode-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/knotes-trinity.man b/ubuntu/_base/tdepim/debian/man/knotes-trinity.man
index 65db3e851..65db3e851 100644
--- a/ubuntu/maverick/tdepim/debian/man/knotes-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/knotes-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kode-trinity.man b/ubuntu/_base/tdepim/debian/man/kode-trinity.man
index 1ddd9e2ef..1ddd9e2ef 100644
--- a/ubuntu/maverick/tdepim/debian/man/kode-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kode-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kolabwizard-trinity.man b/ubuntu/_base/tdepim/debian/man/kolabwizard-trinity.man
index c008b9375..c008b9375 100644
--- a/ubuntu/maverick/tdepim/debian/man/kolabwizard-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kolabwizard-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/konsolekalendar-trinity.man b/ubuntu/_base/tdepim/debian/man/konsolekalendar-trinity.man
index 9b75e205d..9b75e205d 100644
--- a/ubuntu/maverick/tdepim/debian/man/konsolekalendar-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/konsolekalendar-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kontact-trinity.man b/ubuntu/_base/tdepim/debian/man/kontact-trinity.man
index f35c99557..f35c99557 100644
--- a/ubuntu/maverick/tdepim/debian/man/kontact-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kontact-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/korgac-trinity.man b/ubuntu/_base/tdepim/debian/man/korgac-trinity.man
index 8792a097f..8792a097f 100644
--- a/ubuntu/maverick/tdepim/debian/man/korgac-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/korgac-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/korganizer-trinity.man b/ubuntu/_base/tdepim/debian/man/korganizer-trinity.man
index d8fd73ef4..d8fd73ef4 100644
--- a/ubuntu/maverick/tdepim/debian/man/korganizer-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/korganizer-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/korn-trinity.man b/ubuntu/_base/tdepim/debian/man/korn-trinity.man
index 0f8ce9a05..0f8ce9a05 100644
--- a/ubuntu/maverick/tdepim/debian/man/korn-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/korn-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kpalmdoc-trinity.man b/ubuntu/_base/tdepim/debian/man/kpalmdoc-trinity.man
index 5cc3f1352..5cc3f1352 100644
--- a/ubuntu/maverick/tdepim/debian/man/kpalmdoc-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kpalmdoc-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kpilot-trinity.man b/ubuntu/_base/tdepim/debian/man/kpilot-trinity.man
index 35ed2cb02..35ed2cb02 100644
--- a/ubuntu/maverick/tdepim/debian/man/kpilot-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kpilot-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kpilotDaemon-trinity.man b/ubuntu/_base/tdepim/debian/man/kpilotDaemon-trinity.man
index 9965d9215..9965d9215 100644
--- a/ubuntu/maverick/tdepim/debian/man/kpilotDaemon-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kpilotDaemon-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/ksync-trinity.man b/ubuntu/_base/tdepim/debian/man/ksync-trinity.man
index 97e79bb5b..97e79bb5b 100644
--- a/ubuntu/maverick/tdepim/debian/man/ksync-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/ksync-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/ktnef-trinity.man b/ubuntu/_base/tdepim/debian/man/ktnef-trinity.man
index 091e5aab5..091e5aab5 100644
--- a/ubuntu/maverick/tdepim/debian/man/ktnef-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/ktnef-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kwatchgnupg-trinity.man b/ubuntu/_base/tdepim/debian/man/kwatchgnupg-trinity.man
index 421438434..421438434 100644
--- a/ubuntu/maverick/tdepim/debian/man/kwatchgnupg-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kwatchgnupg-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/kxml_compiler-trinity.man b/ubuntu/_base/tdepim/debian/man/kxml_compiler-trinity.man
index 86dc0ad2d..86dc0ad2d 100644
--- a/ubuntu/maverick/tdepim/debian/man/kxml_compiler-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/kxml_compiler-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/multisynk-trinity.man b/ubuntu/_base/tdepim/debian/man/multisynk-trinity.man
index 8b206a978..8b206a978 100644
--- a/ubuntu/maverick/tdepim/debian/man/multisynk-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/multisynk-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/networkstatustestservice-trinity.man b/ubuntu/_base/tdepim/debian/man/networkstatustestservice-trinity.man
index 6ad679a01..6ad679a01 100644
--- a/ubuntu/maverick/tdepim/debian/man/networkstatustestservice-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/networkstatustestservice-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/sloxwizard-trinity.man b/ubuntu/_base/tdepim/debian/man/sloxwizard-trinity.man
index 0fb0b2e78..0fb0b2e78 100644
--- a/ubuntu/maverick/tdepim/debian/man/sloxwizard-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/sloxwizard-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/man/tdeabc2mutt-trinity.man b/ubuntu/_base/tdepim/debian/man/tdeabc2mutt-trinity.man
index 28be058df..28be058df 100644
--- a/ubuntu/maverick/tdepim/debian/man/tdeabc2mutt-trinity.man
+++ b/ubuntu/_base/tdepim/debian/man/tdeabc2mutt-trinity.man
diff --git a/ubuntu/maverick/tdepim/debian/patches/series b/ubuntu/_base/tdepim/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/tdepim/debian/patches/series
+++ b/ubuntu/_base/tdepim/debian/patches/series
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/_base/tdepim/debian/rules
index 4ff2f7ea7..4ff2f7ea7 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/ubuntu/_base/tdepim/debian/rules
diff --git a/ubuntu/maverick/tdepim/debian/shlibs.local b/ubuntu/_base/tdepim/debian/shlibs.local
index 85fbde26a..85fbde26a 100644
--- a/ubuntu/maverick/tdepim/debian/shlibs.local
+++ b/ubuntu/_base/tdepim/debian/shlibs.local
diff --git a/ubuntu/maverick/tdepim/debian/source/format b/ubuntu/_base/tdepim/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdepim/debian/source/format
+++ b/ubuntu/_base/tdepim/debian/source/format
diff --git a/ubuntu/maverick/tdepim/debian/source/options b/ubuntu/_base/tdepim/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdepim/debian/source/options
+++ b/ubuntu/_base/tdepim/debian/source/options
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
index c2ad1a624..c2ad1a624 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kaddressbook
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kalarm
index af8043280..af8043280 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kalarm
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kalarm
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kandy
index 6ca2dc33a..6ca2dc33a 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kandy
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kandy
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.karm
index 8ff0970d3..8ff0970d3 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.karm
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.karm
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
index 95da59a9b..95da59a9b 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kleopatra
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kmail
index 5f1967e2a..5f1967e2a 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kmail
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kmail
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.knode
index 759307042..759307042 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knode
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.knode
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.knotes
index a305098af..a305098af 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.knotes
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.knotes
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
index 471967fad..471967fad 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.konsolekalendar
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kontact
index 6ec86e70d..6ec86e70d 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kontact
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kontact
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.korganizer
index 858d1c9b5..858d1c9b5 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korganizer
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.korganizer
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.korn
index 1b7312787..1b7312787 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.korn
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.korn
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kpilot
index 203443580..203443580 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kpilot
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kpilot
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.ktnef
index 6a144e01f..6a144e01f 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.ktnef
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.ktnef
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
index fdf9ea7f6..fdf9ea7f6 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.kwatchgnupg
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.multisynk
index 74802a4f9..74802a4f9 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-doc-html.doc-base.multisynk
+++ b/ubuntu/_base/tdepim/debian/tdepim-doc-html.doc-base.multisynk
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-tdefile-plugins-trinity.install b/ubuntu/_base/tdepim/debian/tdepim-tdefile-plugins-trinity.install
index d6bd1f7a6..d6bd1f7a6 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/tdepim/debian/tdepim-tdefile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-tdeio-plugins-trinity.install b/ubuntu/_base/tdepim/debian/tdepim-tdeio-plugins-trinity.install
index c88e198d8..c88e198d8 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/tdepim/debian/tdepim-tdeio-plugins-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install b/ubuntu/_base/tdepim/debian/tdepim-tderesources-trinity.install
index 5abc460d5..5abc460d5 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-tderesources-trinity.install
+++ b/ubuntu/_base/tdepim/debian/tdepim-tderesources-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install b/ubuntu/_base/tdepim/debian/tdepim-trinity-dev.install
index c890346c3..c890346c3 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install
+++ b/ubuntu/_base/tdepim/debian/tdepim-trinity-dev.install
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.doc-base b/ubuntu/_base/tdepim/debian/tdepim-trinity-doc.doc-base
index 433473f9a..433473f9a 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.doc-base
+++ b/ubuntu/_base/tdepim/debian/tdepim-trinity-doc.doc-base
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.install b/ubuntu/_base/tdepim/debian/tdepim-trinity-doc.install
index 3454b260b..3454b260b 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-doc.install
+++ b/ubuntu/_base/tdepim/debian/tdepim-trinity-doc.install
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.install b/ubuntu/_base/tdepim/debian/tdepim-wizards-trinity.install
index ef2fe681a..ef2fe681a 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.install
+++ b/ubuntu/_base/tdepim/debian/tdepim-wizards-trinity.install
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.manpages b/ubuntu/_base/tdepim/debian/tdepim-wizards-trinity.manpages
index 04a5781f5..04a5781f5 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.manpages
+++ b/ubuntu/_base/tdepim/debian/tdepim-wizards-trinity.manpages
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu b/ubuntu/_base/tdepim/debian/tdepim-wizards-trinity.menu
index 8b8daf8e6..8b8daf8e6 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/ubuntu/_base/tdepim/debian/tdepim-wizards-trinity.menu
diff --git a/ubuntu/maverick/tdesdk/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/_base/tdesdk/debian/KUBUNTU-DEBIAN-CHANGES
index d73d1b6ae..d73d1b6ae 100644
--- a/ubuntu/maverick/tdesdk/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/_base/tdesdk/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdesdk/debian/cdbs/debian-qt-kde.mk
index 14dce59aa..14dce59aa 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdesdk/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk b/ubuntu/_base/tdesdk/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdesdk/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/versions.pl b/ubuntu/_base/tdesdk/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdesdk/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian b/ubuntu/_base/tdesdk/debian/cervisia-trinity.README.Debian
index d3b879f59..d3b879f59 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.README.Debian
+++ b/ubuntu/_base/tdesdk/debian/cervisia-trinity.README.Debian
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.docs b/ubuntu/_base/tdesdk/debian/cervisia-trinity.docs
index 657c4b5eb..657c4b5eb 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/cervisia-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install b/ubuntu/_base/tdesdk/debian/cervisia-trinity.install
index 653a67d6b..653a67d6b 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/cervisia-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/_base/tdesdk/debian/cervisia-trinity.lintian
index 6759ea297..6759ea297 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/_base/tdesdk/debian/cervisia-trinity.lintian
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu b/ubuntu/_base/tdesdk/debian/cervisia-trinity.menu
index f418eb305..f418eb305 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu
+++ b/ubuntu/_base/tdesdk/debian/cervisia-trinity.menu
diff --git a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.postinst b/ubuntu/_base/tdesdk/debian/cervisia-trinity.postinst
index 800a596bf..800a596bf 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.postinst
+++ b/ubuntu/_base/tdesdk/debian/cervisia-trinity.postinst
diff --git a/ubuntu/maverick/tdesdk/debian/changelog b/ubuntu/_base/tdesdk/debian/changelog
index d0fac74a5..d0fac74a5 100644
--- a/ubuntu/maverick/tdesdk/debian/changelog
+++ b/ubuntu/_base/tdesdk/debian/changelog
diff --git a/ubuntu/maverick/tdesdk/debian/compat b/ubuntu/_base/tdesdk/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdesdk/debian/compat
+++ b/ubuntu/_base/tdesdk/debian/compat
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/_base/tdesdk/debian/control
index f29b7d17b..f29b7d17b 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/_base/tdesdk/debian/control
diff --git a/ubuntu/maverick/tdesdk/debian/copyright b/ubuntu/_base/tdesdk/debian/copyright
index 8574b5937..8574b5937 100644
--- a/ubuntu/maverick/tdesdk/debian/copyright
+++ b/ubuntu/_base/tdesdk/debian/copyright
diff --git a/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl b/ubuntu/_base/tdesdk/debian/desktop-i18n/createdesktop.pl
index c71551dc5..c71551dc5 100644
--- a/ubuntu/maverick/tdesdk/debian/desktop-i18n/createdesktop.pl
+++ b/ubuntu/_base/tdesdk/debian/desktop-i18n/createdesktop.pl
diff --git a/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles b/ubuntu/_base/tdesdk/debian/desktop-i18n/findfiles
index f59fe6bae..f59fe6bae 100644
--- a/ubuntu/maverick/tdesdk/debian/desktop-i18n/findfiles
+++ b/ubuntu/_base/tdesdk/debian/desktop-i18n/findfiles
diff --git a/ubuntu/maverick/tdesdk/debian/desktop-i18n/msgsplit b/ubuntu/_base/tdesdk/debian/desktop-i18n/msgsplit
index 41481d336..41481d336 100644
--- a/ubuntu/maverick/tdesdk/debian/desktop-i18n/msgsplit
+++ b/ubuntu/_base/tdesdk/debian/desktop-i18n/msgsplit
diff --git a/ubuntu/maverick/tdesdk/debian/icons/catalogmanager.xpm b/ubuntu/_base/tdesdk/debian/icons/catalogmanager.xpm
index 7e508d5f3..7e508d5f3 100644
--- a/ubuntu/maverick/tdesdk/debian/icons/catalogmanager.xpm
+++ b/ubuntu/_base/tdesdk/debian/icons/catalogmanager.xpm
diff --git a/ubuntu/maverick/tdesdk/debian/icons/cervisia.xpm b/ubuntu/_base/tdesdk/debian/icons/cervisia.xpm
index 9a2181402..9a2181402 100644
--- a/ubuntu/maverick/tdesdk/debian/icons/cervisia.xpm
+++ b/ubuntu/_base/tdesdk/debian/icons/cervisia.xpm
diff --git a/ubuntu/maverick/tdesdk/debian/icons/kbabel.xpm b/ubuntu/_base/tdesdk/debian/icons/kbabel.xpm
index e4798b899..e4798b899 100644
--- a/ubuntu/maverick/tdesdk/debian/icons/kbabel.xpm
+++ b/ubuntu/_base/tdesdk/debian/icons/kbabel.xpm
diff --git a/ubuntu/maverick/tdesdk/debian/icons/kbabeldict.xpm b/ubuntu/_base/tdesdk/debian/icons/kbabeldict.xpm
index c560a7381..c560a7381 100644
--- a/ubuntu/maverick/tdesdk/debian/icons/kbabeldict.xpm
+++ b/ubuntu/_base/tdesdk/debian/icons/kbabeldict.xpm
diff --git a/ubuntu/maverick/tdesdk/debian/icons/kbugbuster.xpm b/ubuntu/_base/tdesdk/debian/icons/kbugbuster.xpm
index 67e8cadca..67e8cadca 100644
--- a/ubuntu/maverick/tdesdk/debian/icons/kbugbuster.xpm
+++ b/ubuntu/_base/tdesdk/debian/icons/kbugbuster.xpm
diff --git a/ubuntu/maverick/tdesdk/debian/icons/kompare.xpm b/ubuntu/_base/tdesdk/debian/icons/kompare.xpm
index dd0cb8995..dd0cb8995 100644
--- a/ubuntu/maverick/tdesdk/debian/icons/kompare.xpm
+++ b/ubuntu/_base/tdesdk/debian/icons/kompare.xpm
diff --git a/ubuntu/maverick/tdesdk/debian/icons/kuiviewer.xpm b/ubuntu/_base/tdesdk/debian/icons/kuiviewer.xpm
index 398bd6d37..398bd6d37 100644
--- a/ubuntu/maverick/tdesdk/debian/icons/kuiviewer.xpm
+++ b/ubuntu/_base/tdesdk/debian/icons/kuiviewer.xpm
diff --git a/ubuntu/maverick/tdesdk/debian/icons/tdecachegrind.xpm b/ubuntu/_base/tdesdk/debian/icons/tdecachegrind.xpm
index bfcdfc6e2..bfcdfc6e2 100644
--- a/ubuntu/maverick/tdesdk/debian/icons/tdecachegrind.xpm
+++ b/ubuntu/_base/tdesdk/debian/icons/tdecachegrind.xpm
diff --git a/ubuntu/maverick/tdesdk/debian/icons/umbrello.xpm b/ubuntu/_base/tdesdk/debian/icons/umbrello.xpm
index c8ffc2a80..c8ffc2a80 100644
--- a/ubuntu/maverick/tdesdk/debian/icons/umbrello.xpm
+++ b/ubuntu/_base/tdesdk/debian/icons/umbrello.xpm
diff --git a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.docs b/ubuntu/_base/tdesdk/debian/kapptemplate-trinity.docs
index ae1eeaf96..ae1eeaf96 100644
--- a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/kapptemplate-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.install b/ubuntu/_base/tdesdk/debian/kapptemplate-trinity.install
index a10e6654c..a10e6654c 100644
--- a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/kapptemplate-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.lintian b/ubuntu/_base/tdesdk/debian/kapptemplate-trinity.lintian
index 803257d10..803257d10 100644
--- a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.lintian
+++ b/ubuntu/_base/tdesdk/debian/kapptemplate-trinity.lintian
diff --git a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.manpages b/ubuntu/_base/tdesdk/debian/kapptemplate-trinity.manpages
index e558b802c..e558b802c 100644
--- a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/kapptemplate-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.docs b/ubuntu/_base/tdesdk/debian/kbabel-trinity-dev.docs
index 372b1530b..372b1530b 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.docs
+++ b/ubuntu/_base/tdesdk/debian/kbabel-trinity-dev.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install b/ubuntu/_base/tdesdk/debian/kbabel-trinity-dev.install
index 4c2720936..4c2720936 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install
+++ b/ubuntu/_base/tdesdk/debian/kbabel-trinity-dev.install
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian b/ubuntu/_base/tdesdk/debian/kbabel-trinity.README.Debian
index b26892afd..b26892afd 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.README.Debian
+++ b/ubuntu/_base/tdesdk/debian/kbabel-trinity.README.Debian
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.docs b/ubuntu/_base/tdesdk/debian/kbabel-trinity.docs
index 372b1530b..372b1530b 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/kbabel-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install b/ubuntu/_base/tdesdk/debian/kbabel-trinity.install
index 0765b223f..0765b223f 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/kbabel-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.lintian b/ubuntu/_base/tdesdk/debian/kbabel-trinity.lintian
index d2f345fca..d2f345fca 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.lintian
+++ b/ubuntu/_base/tdesdk/debian/kbabel-trinity.lintian
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.manpages b/ubuntu/_base/tdesdk/debian/kbabel-trinity.manpages
index e85be5938..e85be5938 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/kbabel-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu b/ubuntu/_base/tdesdk/debian/kbabel-trinity.menu
index 13ba6a859..13ba6a859 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu
+++ b/ubuntu/_base/tdesdk/debian/kbabel-trinity.menu
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.mime b/ubuntu/_base/tdesdk/debian/kbabel-trinity.mime
index b6e1fe021..b6e1fe021 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.mime
+++ b/ubuntu/_base/tdesdk/debian/kbabel-trinity.mime
diff --git a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.docs b/ubuntu/_base/tdesdk/debian/kbugbuster-trinity.docs
index 94789b715..94789b715 100644
--- a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/kbugbuster-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install b/ubuntu/_base/tdesdk/debian/kbugbuster-trinity.install
index 50b9c1fe5..50b9c1fe5 100644
--- a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/kbugbuster-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.manpages b/ubuntu/_base/tdesdk/debian/kbugbuster-trinity.manpages
index 8fc558a77..8fc558a77 100644
--- a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/kbugbuster-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu b/ubuntu/_base/tdesdk/debian/kbugbuster-trinity.menu
index b30b78d3e..b30b78d3e 100644
--- a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu
+++ b/ubuntu/_base/tdesdk/debian/kbugbuster-trinity.menu
diff --git a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.docs b/ubuntu/_base/tdesdk/debian/kmtrace-trinity.docs
index 44b289f0d..44b289f0d 100644
--- a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/kmtrace-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install b/ubuntu/_base/tdesdk/debian/kmtrace-trinity.install
index a163246b9..a163246b9 100644
--- a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/kmtrace-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.manpages b/ubuntu/_base/tdesdk/debian/kmtrace-trinity.manpages
index 92133295d..92133295d 100644
--- a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/kmtrace-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/kompare-trinity.docs b/ubuntu/_base/tdesdk/debian/kompare-trinity.docs
index d8c52ac2e..d8c52ac2e 100644
--- a/ubuntu/maverick/tdesdk/debian/kompare-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/kompare-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kompare-trinity.install b/ubuntu/_base/tdesdk/debian/kompare-trinity.install
index aca239beb..aca239beb 100644
--- a/ubuntu/maverick/tdesdk/debian/kompare-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/kompare-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kompare-trinity.lintian b/ubuntu/_base/tdesdk/debian/kompare-trinity.lintian
index 70173c488..70173c488 100644
--- a/ubuntu/maverick/tdesdk/debian/kompare-trinity.lintian
+++ b/ubuntu/_base/tdesdk/debian/kompare-trinity.lintian
diff --git a/ubuntu/maverick/tdesdk/debian/kompare-trinity.manpages b/ubuntu/_base/tdesdk/debian/kompare-trinity.manpages
index acf918455..acf918455 100644
--- a/ubuntu/maverick/tdesdk/debian/kompare-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/kompare-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/kompare-trinity.menu b/ubuntu/_base/tdesdk/debian/kompare-trinity.menu
index 7d717cceb..7d717cceb 100644
--- a/ubuntu/maverick/tdesdk/debian/kompare-trinity.menu
+++ b/ubuntu/_base/tdesdk/debian/kompare-trinity.menu
diff --git a/ubuntu/maverick/tdesdk/debian/kspy-trinity.docs b/ubuntu/_base/tdesdk/debian/kspy-trinity.docs
index 755291441..755291441 100644
--- a/ubuntu/maverick/tdesdk/debian/kspy-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/kspy-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/kspy-trinity.install b/ubuntu/_base/tdesdk/debian/kspy-trinity.install
index 12523ee90..12523ee90 100644
--- a/ubuntu/maverick/tdesdk/debian/kspy-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/kspy-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kspy-trinity.lintian b/ubuntu/_base/tdesdk/debian/kspy-trinity.lintian
index 84d9c917f..84d9c917f 100644
--- a/ubuntu/maverick/tdesdk/debian/kspy-trinity.lintian
+++ b/ubuntu/_base/tdesdk/debian/kspy-trinity.lintian
diff --git a/ubuntu/maverick/tdesdk/debian/kspy-trinity.manpages b/ubuntu/_base/tdesdk/debian/kspy-trinity.manpages
index 34831ba91..34831ba91 100644
--- a/ubuntu/maverick/tdesdk/debian/kspy-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/kspy-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.install b/ubuntu/_base/tdesdk/debian/kuiviewer-trinity.install
index 0fbde204f..0fbde204f 100644
--- a/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/kuiviewer-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.manpages b/ubuntu/_base/tdesdk/debian/kuiviewer-trinity.manpages
index abcf3310b..abcf3310b 100644
--- a/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/kuiviewer-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu b/ubuntu/_base/tdesdk/debian/kuiviewer-trinity.menu
index c918b3ed8..c918b3ed8 100644
--- a/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu
+++ b/ubuntu/_base/tdesdk/debian/kuiviewer-trinity.menu
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.docs b/ubuntu/_base/tdesdk/debian/libcvsservice-trinity-dev.docs
index 71e397bfc..71e397bfc 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.docs
+++ b/ubuntu/_base/tdesdk/debian/libcvsservice-trinity-dev.docs
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install b/ubuntu/_base/tdesdk/debian/libcvsservice-trinity-dev.install
index 539779b47..539779b47 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install
+++ b/ubuntu/_base/tdesdk/debian/libcvsservice-trinity-dev.install
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.docs b/ubuntu/_base/tdesdk/debian/libcvsservice0-trinity.docs
index 71e397bfc..71e397bfc 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/libcvsservice0-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.install b/ubuntu/_base/tdesdk/debian/libcvsservice0-trinity.install
index 6f6370493..6f6370493 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/libcvsservice0-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian b/ubuntu/_base/tdesdk/debian/libcvsservice0-trinity.lintian
index ed7e5eea1..ed7e5eea1 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/ubuntu/_base/tdesdk/debian/libcvsservice0-trinity.lintian
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.manpages b/ubuntu/_base/tdesdk/debian/libcvsservice0-trinity.manpages
index 9afa8b3e7..9afa8b3e7 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/libcvsservice0-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/man/adddebug.1 b/ubuntu/_base/tdesdk/debian/man/adddebug.1
index d78dad43c..d78dad43c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/adddebug.1
+++ b/ubuntu/_base/tdesdk/debian/man/adddebug.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/build-progress.sh.1 b/ubuntu/_base/tdesdk/debian/man/build-progress.sh.1
index 28c9d9016..28c9d9016 100644
--- a/ubuntu/maverick/tdesdk/debian/man/build-progress.sh.1
+++ b/ubuntu/_base/tdesdk/debian/man/build-progress.sh.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1 b/ubuntu/_base/tdesdk/debian/man/catalogmanager.1
index db8b17613..db8b17613 100644
--- a/ubuntu/maverick/tdesdk/debian/man/catalogmanager.1
+++ b/ubuntu/_base/tdesdk/debian/man/catalogmanager.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cheatmake.1 b/ubuntu/_base/tdesdk/debian/man/cheatmake.1
index 098449a0b..098449a0b 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cheatmake.1
+++ b/ubuntu/_base/tdesdk/debian/man/cheatmake.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_cvsignore.1 b/ubuntu/_base/tdesdk/debian/man/create_cvsignore.1
index ce63f6f55..ce63f6f55 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_cvsignore.1
+++ b/ubuntu/_base/tdesdk/debian/man/create_cvsignore.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_makefile.1 b/ubuntu/_base/tdesdk/debian/man/create_makefile.1
index e128f23e9..e128f23e9 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_makefile.1
+++ b/ubuntu/_base/tdesdk/debian/man/create_makefile.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1 b/ubuntu/_base/tdesdk/debian/man/create_makefiles.1
index 2efc03795..2efc03795 100644
--- a/ubuntu/maverick/tdesdk/debian/man/create_makefiles.1
+++ b/ubuntu/_base/tdesdk/debian/man/create_makefiles.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvs-clean.1 b/ubuntu/_base/tdesdk/debian/man/cvs-clean.1
index 0706e485c..0706e485c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvs-clean.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvs-clean.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1 b/ubuntu/_base/tdesdk/debian/man/cvs2dist.1
index f0bc71a3e..f0bc71a3e 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvs2dist.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvs2dist.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsaskpass.1 b/ubuntu/_base/tdesdk/debian/man/cvsaskpass.1
index d4b7e5dfd..d4b7e5dfd 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsaskpass.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvsaskpass.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsbackport.1 b/ubuntu/_base/tdesdk/debian/man/cvsbackport.1
index 7181ac671..7181ac671 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsbackport.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvsbackport.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvscheck.1 b/ubuntu/_base/tdesdk/debian/man/cvscheck.1
index 3d79c255b..3d79c255b 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvscheck.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvscheck.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsforwardport.1 b/ubuntu/_base/tdesdk/debian/man/cvsforwardport.1
index 0ca6d29f5..0ca6d29f5 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsforwardport.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvsforwardport.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvslastchange.1 b/ubuntu/_base/tdesdk/debian/man/cvslastchange.1
index b651e4414..b651e4414 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvslastchange.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvslastchange.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvslastlog.1 b/ubuntu/_base/tdesdk/debian/man/cvslastlog.1
index 445a1a74a..445a1a74a 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvslastlog.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvslastlog.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsrevertlast.1 b/ubuntu/_base/tdesdk/debian/man/cvsrevertlast.1
index aedf45aa6..aedf45aa6 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsrevertlast.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvsrevertlast.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cvsservice.1 b/ubuntu/_base/tdesdk/debian/man/cvsservice.1
index 9d5c791d7..9d5c791d7 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cvsservice.1
+++ b/ubuntu/_base/tdesdk/debian/man/cvsservice.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/cxxmetric.1 b/ubuntu/_base/tdesdk/debian/man/cxxmetric.1
index a8a855cde..a8a855cde 100644
--- a/ubuntu/maverick/tdesdk/debian/man/cxxmetric.1
+++ b/ubuntu/_base/tdesdk/debian/man/cxxmetric.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/demangle.1 b/ubuntu/_base/tdesdk/debian/man/demangle.1
index 8f4f3922f..8f4f3922f 100644
--- a/ubuntu/maverick/tdesdk/debian/man/demangle.1
+++ b/ubuntu/_base/tdesdk/debian/man/demangle.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1 b/ubuntu/_base/tdesdk/debian/man/dprof2calltree.1
index 88bcd0b0d..88bcd0b0d 100644
--- a/ubuntu/maverick/tdesdk/debian/man/dprof2calltree.1
+++ b/ubuntu/_base/tdesdk/debian/man/dprof2calltree.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/extend_dmalloc.1 b/ubuntu/_base/tdesdk/debian/man/extend_dmalloc.1
index 0078442ef..0078442ef 100644
--- a/ubuntu/maverick/tdesdk/debian/man/extend_dmalloc.1
+++ b/ubuntu/_base/tdesdk/debian/man/extend_dmalloc.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/extractattr.1 b/ubuntu/_base/tdesdk/debian/man/extractattr.1
index 7e506e449..7e506e449 100644
--- a/ubuntu/maverick/tdesdk/debian/man/extractattr.1
+++ b/ubuntu/_base/tdesdk/debian/man/extractattr.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/extractrc.1 b/ubuntu/_base/tdesdk/debian/man/extractrc.1
index 130fdb089..130fdb089 100644
--- a/ubuntu/maverick/tdesdk/debian/man/extractrc.1
+++ b/ubuntu/_base/tdesdk/debian/man/extractrc.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1 b/ubuntu/_base/tdesdk/debian/man/findmissingcrystal.1
index 32b23294e..32b23294e 100644
--- a/ubuntu/maverick/tdesdk/debian/man/findmissingcrystal.1
+++ b/ubuntu/_base/tdesdk/debian/man/findmissingcrystal.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/fixkdeincludes.1 b/ubuntu/_base/tdesdk/debian/man/fixkdeincludes.1
index 43ae3dfff..43ae3dfff 100644
--- a/ubuntu/maverick/tdesdk/debian/man/fixkdeincludes.1
+++ b/ubuntu/_base/tdesdk/debian/man/fixkdeincludes.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/fixuifiles.1 b/ubuntu/_base/tdesdk/debian/man/fixuifiles.1
index 17ce46a61..17ce46a61 100644
--- a/ubuntu/maverick/tdesdk/debian/man/fixuifiles.1
+++ b/ubuntu/_base/tdesdk/debian/man/fixuifiles.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1 b/ubuntu/_base/tdesdk/debian/man/hotshot2calltree.1
index 8c4d4441c..8c4d4441c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/hotshot2calltree.1
+++ b/ubuntu/_base/tdesdk/debian/man/hotshot2calltree.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kapptemplate.1 b/ubuntu/_base/tdesdk/debian/man/kapptemplate.1
index 1010ecd52..1010ecd52 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kapptemplate.1
+++ b/ubuntu/_base/tdesdk/debian/man/kapptemplate.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabel.1 b/ubuntu/_base/tdesdk/debian/man/kbabel.1
index 047e3626d..047e3626d 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabel.1
+++ b/ubuntu/_base/tdesdk/debian/man/kbabel.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1 b/ubuntu/_base/tdesdk/debian/man/kbabeldict.1
index ffd9b4658..ffd9b4658 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbabeldict.1
+++ b/ubuntu/_base/tdesdk/debian/man/kbabeldict.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kbugbuster.1 b/ubuntu/_base/tdesdk/debian/man/kbugbuster.1
index 29b9c38d7..29b9c38d7 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kbugbuster.1
+++ b/ubuntu/_base/tdesdk/debian/man/kbugbuster.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdedoc.1 b/ubuntu/_base/tdesdk/debian/man/kdedoc.1
index 1911442c2..1911442c2 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdedoc.1
+++ b/ubuntu/_base/tdesdk/debian/man/kdedoc.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdelnk2desktop.py.1 b/ubuntu/_base/tdesdk/debian/man/kdelnk2desktop.py.1
index 41cce73a5..41cce73a5 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdelnk2desktop.py.1
+++ b/ubuntu/_base/tdesdk/debian/man/kdelnk2desktop.py.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1 b/ubuntu/_base/tdesdk/debian/man/kdemangen.pl.1
index 8acd79df1..8acd79df1 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kdemangen.pl.1
+++ b/ubuntu/_base/tdesdk/debian/man/kdemangen.pl.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kminspector.1 b/ubuntu/_base/tdesdk/debian/man/kminspector.1
index 29cb70e5b..29cb70e5b 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kminspector.1
+++ b/ubuntu/_base/tdesdk/debian/man/kminspector.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kmmatch.1 b/ubuntu/_base/tdesdk/debian/man/kmmatch.1
index d80c15542..d80c15542 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kmmatch.1
+++ b/ubuntu/_base/tdesdk/debian/man/kmmatch.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kmtrace.1 b/ubuntu/_base/tdesdk/debian/man/kmtrace.1
index 14f5f9fc8..14f5f9fc8 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kmtrace.1
+++ b/ubuntu/_base/tdesdk/debian/man/kmtrace.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kompare.1 b/ubuntu/_base/tdesdk/debian/man/kompare.1
index e777752e1..e777752e1 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kompare.1
+++ b/ubuntu/_base/tdesdk/debian/man/kompare.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/kuiviewer.1 b/ubuntu/_base/tdesdk/debian/man/kuiviewer.1
index 5439127ae..5439127ae 100644
--- a/ubuntu/maverick/tdesdk/debian/man/kuiviewer.1
+++ b/ubuntu/_base/tdesdk/debian/man/kuiviewer.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/licensecheck.1 b/ubuntu/_base/tdesdk/debian/man/licensecheck.1
index 48728f2c2..48728f2c2 100644
--- a/ubuntu/maverick/tdesdk/debian/man/licensecheck.1
+++ b/ubuntu/_base/tdesdk/debian/man/licensecheck.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/makeobj.1 b/ubuntu/_base/tdesdk/debian/man/makeobj.1
index 50a9f864f..50a9f864f 100644
--- a/ubuntu/maverick/tdesdk/debian/man/makeobj.1
+++ b/ubuntu/_base/tdesdk/debian/man/makeobj.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1 b/ubuntu/_base/tdesdk/debian/man/memprof2calltree.1
index d4f52ead4..d4f52ead4 100644
--- a/ubuntu/maverick/tdesdk/debian/man/memprof2calltree.1
+++ b/ubuntu/_base/tdesdk/debian/man/memprof2calltree.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/op2calltree.1 b/ubuntu/_base/tdesdk/debian/man/op2calltree.1
index 0242e6cd6..0242e6cd6 100644
--- a/ubuntu/maverick/tdesdk/debian/man/op2calltree.1
+++ b/ubuntu/_base/tdesdk/debian/man/op2calltree.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1 b/ubuntu/_base/tdesdk/debian/man/package_crystalsvg.1
index 32d8644e9..32d8644e9 100644
--- a/ubuntu/maverick/tdesdk/debian/man/package_crystalsvg.1
+++ b/ubuntu/_base/tdesdk/debian/man/package_crystalsvg.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/png2mng.pl.1 b/ubuntu/_base/tdesdk/debian/man/png2mng.pl.1
index c86c17275..c86c17275 100644
--- a/ubuntu/maverick/tdesdk/debian/man/png2mng.pl.1
+++ b/ubuntu/_base/tdesdk/debian/man/png2mng.pl.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/po2xml.1 b/ubuntu/_base/tdesdk/debian/man/po2xml.1
index d2f7fe5df..d2f7fe5df 100644
--- a/ubuntu/maverick/tdesdk/debian/man/po2xml.1
+++ b/ubuntu/_base/tdesdk/debian/man/po2xml.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1 b/ubuntu/_base/tdesdk/debian/man/pprof2calltree.1
index b5cf9082c..b5cf9082c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/pprof2calltree.1
+++ b/ubuntu/_base/tdesdk/debian/man/pprof2calltree.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1 b/ubuntu/_base/tdesdk/debian/man/pruneemptydirs.1
index 108c7e4db..108c7e4db 100644
--- a/ubuntu/maverick/tdesdk/debian/man/pruneemptydirs.1
+++ b/ubuntu/_base/tdesdk/debian/man/pruneemptydirs.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/qtdoc.1 b/ubuntu/_base/tdesdk/debian/man/qtdoc.1
index 3b7c09f60..3b7c09f60 100644
--- a/ubuntu/maverick/tdesdk/debian/man/qtdoc.1
+++ b/ubuntu/_base/tdesdk/debian/man/qtdoc.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/split2po.1 b/ubuntu/_base/tdesdk/debian/man/split2po.1
index 539e2f6c8..539e2f6c8 100644
--- a/ubuntu/maverick/tdesdk/debian/man/split2po.1
+++ b/ubuntu/_base/tdesdk/debian/man/split2po.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/swappo.1 b/ubuntu/_base/tdesdk/debian/man/swappo.1
index bb1289d9b..bb1289d9b 100644
--- a/ubuntu/maverick/tdesdk/debian/man/swappo.1
+++ b/ubuntu/_base/tdesdk/debian/man/swappo.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1 b/ubuntu/_base/tdesdk/debian/man/tdecachegrind.1
index d5f3ea064..d5f3ea064 100644
--- a/ubuntu/maverick/tdesdk/debian/man/tdecachegrind.1
+++ b/ubuntu/_base/tdesdk/debian/man/tdecachegrind.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/tdekillall.1 b/ubuntu/_base/tdesdk/debian/man/tdekillall.1
index 92bf4380c..92bf4380c 100644
--- a/ubuntu/maverick/tdesdk/debian/man/tdekillall.1
+++ b/ubuntu/_base/tdesdk/debian/man/tdekillall.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/testkspy.1 b/ubuntu/_base/tdesdk/debian/man/testkspy.1
index afdc702a4..afdc702a4 100644
--- a/ubuntu/maverick/tdesdk/debian/man/testkspy.1
+++ b/ubuntu/_base/tdesdk/debian/man/testkspy.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/transxx.1 b/ubuntu/_base/tdesdk/debian/man/transxx.1
index 6dba22392..6dba22392 100644
--- a/ubuntu/maverick/tdesdk/debian/man/transxx.1
+++ b/ubuntu/_base/tdesdk/debian/man/transxx.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/umbrello.1 b/ubuntu/_base/tdesdk/debian/man/umbrello.1
index 3c5d77d5e..3c5d77d5e 100644
--- a/ubuntu/maverick/tdesdk/debian/man/umbrello.1
+++ b/ubuntu/_base/tdesdk/debian/man/umbrello.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/xml2pot.1 b/ubuntu/_base/tdesdk/debian/man/xml2pot.1
index 0b1a293d5..0b1a293d5 100644
--- a/ubuntu/maverick/tdesdk/debian/man/xml2pot.1
+++ b/ubuntu/_base/tdesdk/debian/man/xml2pot.1
diff --git a/ubuntu/maverick/tdesdk/debian/man/zonetab2pot.py.1 b/ubuntu/_base/tdesdk/debian/man/zonetab2pot.py.1
index d6a4330ad..d6a4330ad 100644
--- a/ubuntu/maverick/tdesdk/debian/man/zonetab2pot.py.1
+++ b/ubuntu/_base/tdesdk/debian/man/zonetab2pot.py.1
diff --git a/ubuntu/maverick/tdesdk/debian/not-installed.list b/ubuntu/_base/tdesdk/debian/not-installed.list
index 179532c87..179532c87 100644
--- a/ubuntu/maverick/tdesdk/debian/not-installed.list
+++ b/ubuntu/_base/tdesdk/debian/not-installed.list
diff --git a/ubuntu/maverick/tdesdk/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdesdk/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdesdk/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdesdk/debian/patches/series b/ubuntu/_base/tdesdk/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdesdk/debian/patches/series
+++ b/ubuntu/_base/tdesdk/debian/patches/series
diff --git a/ubuntu/maverick/tdesdk/debian/poxml-trinity.README.Debian b/ubuntu/_base/tdesdk/debian/poxml-trinity.README.Debian
index 0b5434012..0b5434012 100644
--- a/ubuntu/maverick/tdesdk/debian/poxml-trinity.README.Debian
+++ b/ubuntu/_base/tdesdk/debian/poxml-trinity.README.Debian
diff --git a/ubuntu/maverick/tdesdk/debian/poxml-trinity.install b/ubuntu/_base/tdesdk/debian/poxml-trinity.install
index 290c62266..290c62266 100644
--- a/ubuntu/maverick/tdesdk/debian/poxml-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/poxml-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/poxml-trinity.manpages b/ubuntu/_base/tdesdk/debian/poxml-trinity.manpages
index 05e2191bf..05e2191bf 100644
--- a/ubuntu/maverick/tdesdk/debian/poxml-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/poxml-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/_base/tdesdk/debian/rules
index db09659bd..db09659bd 100755
--- a/ubuntu/maverick/tdesdk/debian/rules
+++ b/ubuntu/_base/tdesdk/debian/rules
diff --git a/ubuntu/maverick/tdesdk/debian/source/format b/ubuntu/_base/tdesdk/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdesdk/debian/source/format
+++ b/ubuntu/_base/tdesdk/debian/source/format
diff --git a/ubuntu/maverick/tdesdk/debian/source/options b/ubuntu/_base/tdesdk/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdesdk/debian/source/options
+++ b/ubuntu/_base/tdesdk/debian/source/options
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.docs b/ubuntu/_base/tdesdk/debian/tdecachegrind-converters-trinity.docs
index 613037510..613037510 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/tdecachegrind-converters-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.install b/ubuntu/_base/tdesdk/debian/tdecachegrind-converters-trinity.install
index 742cfc523..742cfc523 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/tdecachegrind-converters-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.manpages b/ubuntu/_base/tdesdk/debian/tdecachegrind-converters-trinity.manpages
index 977c48e2d..977c48e2d 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-converters-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/tdecachegrind-converters-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.README.Debian
index 8a17e5024..8a17e5024 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.README.Debian
+++ b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.README.Debian
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.docs b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.docs
index dd7f4d534..dd7f4d534 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.install
index b1b9b739e..b1b9b739e 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.manpages b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.manpages
index 367c3db5d..367c3db5d 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.menu
index 27464553a..27464553a 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/ubuntu/_base/tdesdk/debian/tdecachegrind-trinity.menu
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia b/ubuntu/_base/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
index f9caebf8e..f9caebf8e 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-doc-html.doc-base.cervisia
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel b/ubuntu/_base/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
index 1b1c8620e..1b1c8620e 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-doc-html.doc-base.kbabel
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind b/ubuntu/_base/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
index 9ff3f0552..9ff3f0552 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-doc-html.doc-base.tdecachegrind
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello b/ubuntu/_base/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
index d32efe53f..d32efe53f 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-doc-html.doc-base.umbrello
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian b/ubuntu/_base/tdesdk/debian/tdesdk-misc-trinity.README.Debian
index 30cf06ddf..30cf06ddf 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.README.Debian
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-misc-trinity.README.Debian
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/_base/tdesdk/debian/tdesdk-misc-trinity.install
index 38dbfc076..38dbfc076 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-misc-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.links b/ubuntu/_base/tdesdk/debian/tdesdk-misc-trinity.links
index c989147e1..c989147e1 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.links
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-misc-trinity.links
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
index f0ff0c7b8..f0ff0c7b8 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.README.Debian
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.docs b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.docs
index 490ab041d..490ab041d 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.install
index 8d88a20a5..8d88a20a5 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.lintian
index cecda9973..cecda9973 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.lintian
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.manpages b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.manpages
index bcab66ddd..bcab66ddd 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-scripts-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install b/ubuntu/_base/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install
index 3a1f0630d..3a1f0630d 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-tdefile-plugins-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs b/ubuntu/_base/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs
index ce721bb5e..ce721bb5e 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-tdeio-plugins-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install b/ubuntu/_base/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install
index ef4f3a473..ef4f3a473 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-tdeio-plugins-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian b/ubuntu/_base/tdesdk/debian/tdesdk-trinity.README.Debian
index f710e6d6d..f710e6d6d 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-trinity.README.Debian
+++ b/ubuntu/_base/tdesdk/debian/tdesdk-trinity.README.Debian
diff --git a/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.docs b/ubuntu/_base/tdesdk/debian/tdeunittest-trinity.docs
index dfb20154e..dfb20154e 100644
--- a/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/tdeunittest-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.install b/ubuntu/_base/tdesdk/debian/tdeunittest-trinity.install
index efefebac3..efefebac3 100644
--- a/ubuntu/maverick/tdesdk/debian/tdeunittest-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/tdeunittest-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian b/ubuntu/_base/tdesdk/debian/umbrello-trinity.README.Debian
index 54b6b0c42..54b6b0c42 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.README.Debian
+++ b/ubuntu/_base/tdesdk/debian/umbrello-trinity.README.Debian
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.docs b/ubuntu/_base/tdesdk/debian/umbrello-trinity.docs
index 07bf3446c..07bf3446c 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.docs
+++ b/ubuntu/_base/tdesdk/debian/umbrello-trinity.docs
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.install b/ubuntu/_base/tdesdk/debian/umbrello-trinity.install
index dbb79a2ad..dbb79a2ad 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.install
+++ b/ubuntu/_base/tdesdk/debian/umbrello-trinity.install
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.lintian b/ubuntu/_base/tdesdk/debian/umbrello-trinity.lintian
index 17c9ba52c..17c9ba52c 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.lintian
+++ b/ubuntu/_base/tdesdk/debian/umbrello-trinity.lintian
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.manpages b/ubuntu/_base/tdesdk/debian/umbrello-trinity.manpages
index 537bedefe..537bedefe 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.manpages
+++ b/ubuntu/_base/tdesdk/debian/umbrello-trinity.manpages
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.menu b/ubuntu/_base/tdesdk/debian/umbrello-trinity.menu
index 702341646..702341646 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.menu
+++ b/ubuntu/_base/tdesdk/debian/umbrello-trinity.menu
diff --git a/ubuntu/maverick/tdetoys/debian/amor-trinity.README.Debian b/ubuntu/_base/tdetoys/debian/amor-trinity.README.Debian
index a68a70f45..a68a70f45 100644
--- a/ubuntu/maverick/tdetoys/debian/amor-trinity.README.Debian
+++ b/ubuntu/_base/tdetoys/debian/amor-trinity.README.Debian
diff --git a/ubuntu/maverick/tdetoys/debian/amor-trinity.docs b/ubuntu/_base/tdetoys/debian/amor-trinity.docs
index 114e58b83..114e58b83 100644
--- a/ubuntu/maverick/tdetoys/debian/amor-trinity.docs
+++ b/ubuntu/_base/tdetoys/debian/amor-trinity.docs
diff --git a/ubuntu/maverick/tdetoys/debian/amor-trinity.install b/ubuntu/_base/tdetoys/debian/amor-trinity.install
index d2a6265dd..d2a6265dd 100644
--- a/ubuntu/maverick/tdetoys/debian/amor-trinity.install
+++ b/ubuntu/_base/tdetoys/debian/amor-trinity.install
diff --git a/ubuntu/maverick/tdetoys/debian/amor-trinity.menu b/ubuntu/_base/tdetoys/debian/amor-trinity.menu
index d154e69cb..d154e69cb 100644
--- a/ubuntu/maverick/tdetoys/debian/amor-trinity.menu
+++ b/ubuntu/_base/tdetoys/debian/amor-trinity.menu
diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdetoys/debian/cdbs/debian-qt-kde.mk
index 14dce59aa..14dce59aa 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdetoys/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk b/ubuntu/_base/tdetoys/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdetoys/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/versions.pl b/ubuntu/_base/tdetoys/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdetoys/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdetoys/debian/changelog b/ubuntu/_base/tdetoys/debian/changelog
index fe5b85503..fe5b85503 100644
--- a/ubuntu/maverick/tdetoys/debian/changelog
+++ b/ubuntu/_base/tdetoys/debian/changelog
diff --git a/ubuntu/maverick/tdetoys/debian/compat b/ubuntu/_base/tdetoys/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdetoys/debian/compat
+++ b/ubuntu/_base/tdetoys/debian/compat
diff --git a/ubuntu/maverick/tdetoys/debian/control b/ubuntu/_base/tdetoys/debian/control
index 3fead5e5e..3fead5e5e 100644
--- a/ubuntu/maverick/tdetoys/debian/control
+++ b/ubuntu/_base/tdetoys/debian/control
diff --git a/ubuntu/maverick/tdetoys/debian/copyright b/ubuntu/_base/tdetoys/debian/copyright
index 0fbdac055..0fbdac055 100644
--- a/ubuntu/maverick/tdetoys/debian/copyright
+++ b/ubuntu/_base/tdetoys/debian/copyright
diff --git a/ubuntu/maverick/tdetoys/debian/eyesapplet-trinity.install b/ubuntu/_base/tdetoys/debian/eyesapplet-trinity.install
index 60e3c7b16..60e3c7b16 100644
--- a/ubuntu/maverick/tdetoys/debian/eyesapplet-trinity.install
+++ b/ubuntu/_base/tdetoys/debian/eyesapplet-trinity.install
diff --git a/ubuntu/maverick/tdetoys/debian/fifteenapplet-trinity.install b/ubuntu/_base/tdetoys/debian/fifteenapplet-trinity.install
index d54014b4b..d54014b4b 100644
--- a/ubuntu/maverick/tdetoys/debian/fifteenapplet-trinity.install
+++ b/ubuntu/_base/tdetoys/debian/fifteenapplet-trinity.install
diff --git a/ubuntu/maverick/tdetoys/debian/icons/amor.xpm b/ubuntu/_base/tdetoys/debian/icons/amor.xpm
index b3d73b366..b3d73b366 100644
--- a/ubuntu/maverick/tdetoys/debian/icons/amor.xpm
+++ b/ubuntu/_base/tdetoys/debian/icons/amor.xpm
diff --git a/ubuntu/maverick/tdetoys/debian/icons/kodo.xpm b/ubuntu/_base/tdetoys/debian/icons/kodo.xpm
index 8d73544a8..8d73544a8 100644
--- a/ubuntu/maverick/tdetoys/debian/icons/kodo.xpm
+++ b/ubuntu/_base/tdetoys/debian/icons/kodo.xpm
diff --git a/ubuntu/maverick/tdetoys/debian/icons/kteatime.xpm b/ubuntu/_base/tdetoys/debian/icons/kteatime.xpm
index d3bfd04e3..d3bfd04e3 100644
--- a/ubuntu/maverick/tdetoys/debian/icons/kteatime.xpm
+++ b/ubuntu/_base/tdetoys/debian/icons/kteatime.xpm
diff --git a/ubuntu/maverick/tdetoys/debian/icons/ktux.xpm b/ubuntu/_base/tdetoys/debian/icons/ktux.xpm
index 1067dd22a..1067dd22a 100644
--- a/ubuntu/maverick/tdetoys/debian/icons/ktux.xpm
+++ b/ubuntu/_base/tdetoys/debian/icons/ktux.xpm
diff --git a/ubuntu/maverick/tdetoys/debian/icons/kworldclock.xpm b/ubuntu/_base/tdetoys/debian/icons/kworldclock.xpm
index cee61a9a5..cee61a9a5 100644
--- a/ubuntu/maverick/tdetoys/debian/icons/kworldclock.xpm
+++ b/ubuntu/_base/tdetoys/debian/icons/kworldclock.xpm
diff --git a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.README.Debian b/ubuntu/_base/tdetoys/debian/kmoon-trinity.README.Debian
index ccd25e20e..ccd25e20e 100644
--- a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.README.Debian
+++ b/ubuntu/_base/tdetoys/debian/kmoon-trinity.README.Debian
diff --git a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.docs b/ubuntu/_base/tdetoys/debian/kmoon-trinity.docs
index be1167729..be1167729 100644
--- a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.docs
+++ b/ubuntu/_base/tdetoys/debian/kmoon-trinity.docs
diff --git a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install b/ubuntu/_base/tdetoys/debian/kmoon-trinity.install
index 818d57926..818d57926 100644
--- a/ubuntu/maverick/tdetoys/debian/kmoon-trinity.install
+++ b/ubuntu/_base/tdetoys/debian/kmoon-trinity.install
diff --git a/ubuntu/maverick/tdetoys/debian/kodo-trinity.README.Debian b/ubuntu/_base/tdetoys/debian/kodo-trinity.README.Debian
index e79552248..e79552248 100644
--- a/ubuntu/maverick/tdetoys/debian/kodo-trinity.README.Debian
+++ b/ubuntu/_base/tdetoys/debian/kodo-trinity.README.Debian
diff --git a/ubuntu/maverick/tdetoys/debian/kodo-trinity.install b/ubuntu/_base/tdetoys/debian/kodo-trinity.install
index 6e684f2a4..6e684f2a4 100644
--- a/ubuntu/maverick/tdetoys/debian/kodo-trinity.install
+++ b/ubuntu/_base/tdetoys/debian/kodo-trinity.install
diff --git a/ubuntu/maverick/tdetoys/debian/kodo-trinity.menu b/ubuntu/_base/tdetoys/debian/kodo-trinity.menu
index f4e9ffc63..f4e9ffc63 100644
--- a/ubuntu/maverick/tdetoys/debian/kodo-trinity.menu
+++ b/ubuntu/_base/tdetoys/debian/kodo-trinity.menu
diff --git a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.README.Debian b/ubuntu/_base/tdetoys/debian/kteatime-trinity.README.Debian
index 5a1d210a8..5a1d210a8 100644
--- a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.README.Debian
+++ b/ubuntu/_base/tdetoys/debian/kteatime-trinity.README.Debian
diff --git a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.docs b/ubuntu/_base/tdetoys/debian/kteatime-trinity.docs
index 30b44fbbd..30b44fbbd 100644
--- a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.docs
+++ b/ubuntu/_base/tdetoys/debian/kteatime-trinity.docs
diff --git a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.install b/ubuntu/_base/tdetoys/debian/kteatime-trinity.install
index b72e05538..b72e05538 100644
--- a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.install
+++ b/ubuntu/_base/tdetoys/debian/kteatime-trinity.install
diff --git a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.menu b/ubuntu/_base/tdetoys/debian/kteatime-trinity.menu
index 14846163d..14846163d 100644
--- a/ubuntu/maverick/tdetoys/debian/kteatime-trinity.menu
+++ b/ubuntu/_base/tdetoys/debian/kteatime-trinity.menu
diff --git a/ubuntu/maverick/tdetoys/debian/ktux-trinity.docs b/ubuntu/_base/tdetoys/debian/ktux-trinity.docs
index 1b5212f4a..1b5212f4a 100644
--- a/ubuntu/maverick/tdetoys/debian/ktux-trinity.docs
+++ b/ubuntu/_base/tdetoys/debian/ktux-trinity.docs
diff --git a/ubuntu/maverick/tdetoys/debian/ktux-trinity.install b/ubuntu/_base/tdetoys/debian/ktux-trinity.install
index 3062467a9..3062467a9 100644
--- a/ubuntu/maverick/tdetoys/debian/ktux-trinity.install
+++ b/ubuntu/_base/tdetoys/debian/ktux-trinity.install
diff --git a/ubuntu/maverick/tdetoys/debian/ktux-trinity.menu b/ubuntu/_base/tdetoys/debian/ktux-trinity.menu
index bac06eccf..bac06eccf 100644
--- a/ubuntu/maverick/tdetoys/debian/ktux-trinity.menu
+++ b/ubuntu/_base/tdetoys/debian/ktux-trinity.menu
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.README.Debian b/ubuntu/_base/tdetoys/debian/kweather-trinity.README.Debian
index c4fa8f41b..c4fa8f41b 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.README.Debian
+++ b/ubuntu/_base/tdetoys/debian/kweather-trinity.README.Debian
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.docs b/ubuntu/_base/tdetoys/debian/kweather-trinity.docs
index 30669d601..30669d601 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.docs
+++ b/ubuntu/_base/tdetoys/debian/kweather-trinity.docs
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.install b/ubuntu/_base/tdetoys/debian/kweather-trinity.install
index ae0fb921e..ae0fb921e 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.install
+++ b/ubuntu/_base/tdetoys/debian/kweather-trinity.install
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian b/ubuntu/_base/tdetoys/debian/kweather-trinity.lintian
index 2a4387162..2a4387162 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian
+++ b/ubuntu/_base/tdetoys/debian/kweather-trinity.lintian
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.postinst b/ubuntu/_base/tdetoys/debian/kweather-trinity.postinst
index 99a084399..99a084399 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.postinst
+++ b/ubuntu/_base/tdetoys/debian/kweather-trinity.postinst
diff --git a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.README.Debian b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.README.Debian
index fad42290f..fad42290f 100644
--- a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.README.Debian
+++ b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.README.Debian
diff --git a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.install b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.install
index 1705403b7..1705403b7 100644
--- a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.install
+++ b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.install
diff --git a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.menu b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.menu
index 2ddfdeb7e..2ddfdeb7e 100644
--- a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.menu
+++ b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.menu
diff --git a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.postinst b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.postinst
index 9e2c0df3e..9e2c0df3e 100644
--- a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.postinst
+++ b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.postinst
diff --git a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.prerm b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.prerm
index b31a8a6ad..b31a8a6ad 100644
--- a/ubuntu/maverick/tdetoys/debian/kworldclock-trinity.prerm
+++ b/ubuntu/_base/tdetoys/debian/kworldclock-trinity.prerm
diff --git a/ubuntu/maverick/tdetoys/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdetoys/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdetoys/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdetoys/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdetoys/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdetoys/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdetoys/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdetoys/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdetoys/debian/patches/series b/ubuntu/_base/tdetoys/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdetoys/debian/patches/series
+++ b/ubuntu/_base/tdetoys/debian/patches/series
diff --git a/ubuntu/maverick/tdetoys/debian/rules b/ubuntu/_base/tdetoys/debian/rules
index e4de8f31c..e4de8f31c 100755
--- a/ubuntu/maverick/tdetoys/debian/rules
+++ b/ubuntu/_base/tdetoys/debian/rules
diff --git a/ubuntu/maverick/tdetoys/debian/source/format b/ubuntu/_base/tdetoys/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdetoys/debian/source/format
+++ b/ubuntu/_base/tdetoys/debian/source/format
diff --git a/ubuntu/maverick/tdetoys/debian/source/options b/ubuntu/_base/tdetoys/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdetoys/debian/source/options
+++ b/ubuntu/_base/tdetoys/debian/source/options
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.amor b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.amor
index b6bdc1069..b6bdc1069 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.amor
+++ b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.amor
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon
index 0ed6e279f..0ed6e279f 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon
+++ b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kmoon
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kodo b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kodo
index 9393d7ba4..9393d7ba4 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kodo
+++ b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kodo
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
index 98856674c..98856674c 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
+++ b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kteatime
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kweather b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kweather
index 110d5f8ac..110d5f8ac 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kweather
+++ b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kweather
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock
index d73c2a411..d73c2a411 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock
+++ b/ubuntu/_base/tdetoys/debian/tdetoys-doc-html.doc-base.kworldclock
diff --git a/ubuntu/maverick/tdetoys/debian/tdetoys-trinity.README.Debian b/ubuntu/_base/tdetoys/debian/tdetoys-trinity.README.Debian
index 564c3d11e..564c3d11e 100644
--- a/ubuntu/maverick/tdetoys/debian/tdetoys-trinity.README.Debian
+++ b/ubuntu/_base/tdetoys/debian/tdetoys-trinity.README.Debian
diff --git a/ubuntu/maverick/tdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 2a0aadb8d..2a0aadb8d 100644
--- a/ubuntu/maverick/tdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/_base/tdeutils/debian/ark-trinity-trinity.lintian
index 47861fafc..47861fafc 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/_base/tdeutils/debian/ark-trinity-trinity.lintian
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.install b/ubuntu/_base/tdeutils/debian/ark-trinity.install
index 27b3cea81..27b3cea81 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/ark-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.manpages b/ubuntu/_base/tdeutils/debian/ark-trinity.manpages
index 37ed04716..37ed04716 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.manpages
+++ b/ubuntu/_base/tdeutils/debian/ark-trinity.manpages
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.menu b/ubuntu/_base/tdeutils/debian/ark-trinity.menu
index a306b4732..a306b4732 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/ark-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.mime b/ubuntu/_base/tdeutils/debian/ark-trinity.mime
index a46ab8432..a46ab8432 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.mime
+++ b/ubuntu/_base/tdeutils/debian/ark-trinity.mime
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.postinst b/ubuntu/_base/tdeutils/debian/ark-trinity.postinst
index b919d035f..b919d035f 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.postinst
+++ b/ubuntu/_base/tdeutils/debian/ark-trinity.postinst
diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdeutils/debian/cdbs/debian-qt-kde.mk
index 14dce59aa..14dce59aa 100644
--- a/ubuntu/maverick/tdeutils/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdeutils/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk b/ubuntu/_base/tdeutils/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdeutils/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/versions.pl b/ubuntu/_base/tdeutils/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdeutils/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdeutils/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdeutils/debian/changelog b/ubuntu/_base/tdeutils/debian/changelog
index e869e1a84..e869e1a84 100644
--- a/ubuntu/maverick/tdeutils/debian/changelog
+++ b/ubuntu/_base/tdeutils/debian/changelog
diff --git a/ubuntu/maverick/tdeutils/debian/compat b/ubuntu/_base/tdeutils/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdeutils/debian/compat
+++ b/ubuntu/_base/tdeutils/debian/compat
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/_base/tdeutils/debian/control
index 769fbede7..769fbede7 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/_base/tdeutils/debian/control
diff --git a/ubuntu/maverick/tdeutils/debian/copyright b/ubuntu/_base/tdeutils/debian/copyright
index dfe16e1c5..dfe16e1c5 100644
--- a/ubuntu/maverick/tdeutils/debian/copyright
+++ b/ubuntu/_base/tdeutils/debian/copyright
diff --git a/ubuntu/maverick/tdeutils/debian/icons/ark-16.xpm b/ubuntu/_base/tdeutils/debian/icons/ark-16.xpm
index 4a5e3da20..4a5e3da20 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/ark-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/ark-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/ark.xpm b/ubuntu/_base/tdeutils/debian/icons/ark.xpm
index 4210cd20c..4210cd20c 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/ark.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/ark.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kcalc-16.xpm b/ubuntu/_base/tdeutils/debian/icons/kcalc-16.xpm
index 96b3358af..96b3358af 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kcalc-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kcalc-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kcalc.xpm b/ubuntu/_base/tdeutils/debian/icons/kcalc.xpm
index 99b79e585..99b79e585 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kcalc.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kcalc.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kcharselect-16.xpm b/ubuntu/_base/tdeutils/debian/icons/kcharselect-16.xpm
index 37eea509a..37eea509a 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kcharselect-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kcharselect-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kcharselect.xpm b/ubuntu/_base/tdeutils/debian/icons/kcharselect.xpm
index 4d3187509..4d3187509 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kcharselect.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kcharselect.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kdf-16.xpm b/ubuntu/_base/tdeutils/debian/icons/kdf-16.xpm
index e9f074b42..e9f074b42 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kdf-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kdf-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kdf.xpm b/ubuntu/_base/tdeutils/debian/icons/kdf.xpm
index b4c9d470a..b4c9d470a 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kdf.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kdf.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kedit-16.xpm b/ubuntu/_base/tdeutils/debian/icons/kedit-16.xpm
index d5d2e7cfb..d5d2e7cfb 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kedit-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kedit-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kedit.xpm b/ubuntu/_base/tdeutils/debian/icons/kedit.xpm
index 5f973d166..5f973d166 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kedit.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kedit.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kfloppy-16.xpm b/ubuntu/_base/tdeutils/debian/icons/kfloppy-16.xpm
index bfea0ec17..bfea0ec17 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kfloppy-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kfloppy-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kfloppy.xpm b/ubuntu/_base/tdeutils/debian/icons/kfloppy.xpm
index facf97162..facf97162 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kfloppy.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kfloppy.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kgpg-16.xpm b/ubuntu/_base/tdeutils/debian/icons/kgpg-16.xpm
index 7388264e5..7388264e5 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kgpg-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kgpg-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kgpg.xpm b/ubuntu/_base/tdeutils/debian/icons/kgpg.xpm
index 8f1a3dcf0..8f1a3dcf0 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kgpg.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kgpg.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/khexedit-16.xpm b/ubuntu/_base/tdeutils/debian/icons/khexedit-16.xpm
index d0134aa3e..d0134aa3e 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/khexedit-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/khexedit-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/khexedit.xpm b/ubuntu/_base/tdeutils/debian/icons/khexedit.xpm
index 06bd1a274..06bd1a274 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/khexedit.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/khexedit.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kjots-16.xpm b/ubuntu/_base/tdeutils/debian/icons/kjots-16.xpm
index a94206162..a94206162 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kjots-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kjots-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kjots.xpm b/ubuntu/_base/tdeutils/debian/icons/kjots.xpm
index ff080d32e..ff080d32e 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kjots.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kjots.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kregexpeditor-16.xpm b/ubuntu/_base/tdeutils/debian/icons/kregexpeditor-16.xpm
index bfd3d835d..bfd3d835d 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kregexpeditor-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kregexpeditor-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kregexpeditor.xpm b/ubuntu/_base/tdeutils/debian/icons/kregexpeditor.xpm
index a81cf60c6..a81cf60c6 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kregexpeditor.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kregexpeditor.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/ktimer-16.xpm b/ubuntu/_base/tdeutils/debian/icons/ktimer-16.xpm
index f0c857680..f0c857680 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/ktimer-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/ktimer-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/ktimer.xpm b/ubuntu/_base/tdeutils/debian/icons/ktimer.xpm
index 4f08fe0fc..4f08fe0fc 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/ktimer.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/ktimer.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kwikdisk-16.xpm b/ubuntu/_base/tdeutils/debian/icons/kwikdisk-16.xpm
index e861b0b34..e861b0b34 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kwikdisk-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kwikdisk-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/kwikdisk.xpm b/ubuntu/_base/tdeutils/debian/icons/kwikdisk.xpm
index 4521b420a..4521b420a 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/kwikdisk.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/kwikdisk.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/superkaramba-16.xpm b/ubuntu/_base/tdeutils/debian/icons/superkaramba-16.xpm
index edb9db936..edb9db936 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/superkaramba-16.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/superkaramba-16.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/icons/superkaramba.xpm b/ubuntu/_base/tdeutils/debian/icons/superkaramba.xpm
index c4f096556..c4f096556 100644
--- a/ubuntu/maverick/tdeutils/debian/icons/superkaramba.xpm
+++ b/ubuntu/_base/tdeutils/debian/icons/superkaramba.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/_base/tdeutils/debian/kcalc-trinity-trinity.lintian
index 0b36154e5..0b36154e5 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/_base/tdeutils/debian/kcalc-trinity-trinity.lintian
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install b/ubuntu/_base/tdeutils/debian/kcalc-trinity.install
index e5c35395d..e5c35395d 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kcalc-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.manpages b/ubuntu/_base/tdeutils/debian/kcalc-trinity.manpages
index ee2f0ad0a..ee2f0ad0a 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.manpages
+++ b/ubuntu/_base/tdeutils/debian/kcalc-trinity.manpages
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu b/ubuntu/_base/tdeutils/debian/kcalc-trinity.menu
index d3af6bc1f..d3af6bc1f 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/kcalc-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.postinst b/ubuntu/_base/tdeutils/debian/kcalc-trinity.postinst
index 6cf1c841c..6cf1c841c 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.postinst
+++ b/ubuntu/_base/tdeutils/debian/kcalc-trinity.postinst
diff --git a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.install b/ubuntu/_base/tdeutils/debian/kcharselect-trinity.install
index 46f690528..46f690528 100644
--- a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kcharselect-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.manpages b/ubuntu/_base/tdeutils/debian/kcharselect-trinity.manpages
index 6a1e28fb7..6a1e28fb7 100644
--- a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.manpages
+++ b/ubuntu/_base/tdeutils/debian/kcharselect-trinity.manpages
diff --git a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu b/ubuntu/_base/tdeutils/debian/kcharselect-trinity.menu
index 523105d5a..523105d5a 100644
--- a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/kcharselect-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.install b/ubuntu/_base/tdeutils/debian/kdf-trinity.install
index f8e6118ce..f8e6118ce 100644
--- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kdf-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.manpages b/ubuntu/_base/tdeutils/debian/kdf-trinity.manpages
index ac5e86975..ac5e86975 100644
--- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.manpages
+++ b/ubuntu/_base/tdeutils/debian/kdf-trinity.manpages
diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu b/ubuntu/_base/tdeutils/debian/kdf-trinity.menu
index 8862f9669..8862f9669 100644
--- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/kdf-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.install b/ubuntu/_base/tdeutils/debian/kedit-trinity.install
index 40d08d1ab..40d08d1ab 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kedit-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian b/ubuntu/_base/tdeutils/debian/kedit-trinity.lintian
index fdde7bd3b..fdde7bd3b 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/_base/tdeutils/debian/kedit-trinity.lintian
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.manpages b/ubuntu/_base/tdeutils/debian/kedit-trinity.manpages
index 84374715a..84374715a 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.manpages
+++ b/ubuntu/_base/tdeutils/debian/kedit-trinity.manpages
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu b/ubuntu/_base/tdeutils/debian/kedit-trinity.menu
index 0f5f2fbe2..0f5f2fbe2 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/kedit-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.mime b/ubuntu/_base/tdeutils/debian/kedit-trinity.mime
index 966a4bb90..966a4bb90 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.mime
+++ b/ubuntu/_base/tdeutils/debian/kedit-trinity.mime
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.postinst b/ubuntu/_base/tdeutils/debian/kedit-trinity.postinst
index 1fa143a43..1fa143a43 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.postinst
+++ b/ubuntu/_base/tdeutils/debian/kedit-trinity.postinst
diff --git a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.install b/ubuntu/_base/tdeutils/debian/kfloppy-trinity.install
index 5c1588041..5c1588041 100644
--- a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kfloppy-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.manpages b/ubuntu/_base/tdeutils/debian/kfloppy-trinity.manpages
index 02c1ea86f..02c1ea86f 100644
--- a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.manpages
+++ b/ubuntu/_base/tdeutils/debian/kfloppy-trinity.manpages
diff --git a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu b/ubuntu/_base/tdeutils/debian/kfloppy-trinity.menu
index 034dc4d38..034dc4d38 100644
--- a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/kfloppy-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.install b/ubuntu/_base/tdeutils/debian/kgpg-trinity.install
index 2317f8bad..2317f8bad 100644
--- a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kgpg-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.manpages b/ubuntu/_base/tdeutils/debian/kgpg-trinity.manpages
index 111b73663..111b73663 100644
--- a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.manpages
+++ b/ubuntu/_base/tdeutils/debian/kgpg-trinity.manpages
diff --git a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu b/ubuntu/_base/tdeutils/debian/kgpg-trinity.menu
index aae18d3de..aae18d3de 100644
--- a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/kgpg-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.install b/ubuntu/_base/tdeutils/debian/khexedit-trinity.install
index 7ac6b4f2e..7ac6b4f2e 100644
--- a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/khexedit-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.manpages b/ubuntu/_base/tdeutils/debian/khexedit-trinity.manpages
index 41235ebfd..41235ebfd 100644
--- a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.manpages
+++ b/ubuntu/_base/tdeutils/debian/khexedit-trinity.manpages
diff --git a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu b/ubuntu/_base/tdeutils/debian/khexedit-trinity.menu
index 6e223ed41..6e223ed41 100644
--- a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/khexedit-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/kjots-trinity.install b/ubuntu/_base/tdeutils/debian/kjots-trinity.install
index 2e1546b5c..2e1546b5c 100644
--- a/ubuntu/maverick/tdeutils/debian/kjots-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kjots-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu b/ubuntu/_base/tdeutils/debian/kjots-trinity.menu
index 46670623d..46670623d 100644
--- a/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/kjots-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/klaptopdaemon-trinity.install b/ubuntu/_base/tdeutils/debian/klaptopdaemon-trinity.install
index fe1e6cc76..fe1e6cc76 100644
--- a/ubuntu/maverick/tdeutils/debian/klaptopdaemon-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/klaptopdaemon-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/klaptopdaemon-trinity.prerm b/ubuntu/_base/tdeutils/debian/klaptopdaemon-trinity.prerm
index ecc9ea389..ecc9ea389 100644
--- a/ubuntu/maverick/tdeutils/debian/klaptopdaemon-trinity.prerm
+++ b/ubuntu/_base/tdeutils/debian/klaptopdaemon-trinity.prerm
diff --git a/ubuntu/maverick/tdeutils/debian/klaptopdaemon.README.Debian b/ubuntu/_base/tdeutils/debian/klaptopdaemon.README.Debian
index 04c3e1b4e..04c3e1b4e 100644
--- a/ubuntu/maverick/tdeutils/debian/klaptopdaemon.README.Debian
+++ b/ubuntu/_base/tdeutils/debian/klaptopdaemon.README.Debian
diff --git a/ubuntu/maverick/tdeutils/debian/kmilo-legacy-trinity.install b/ubuntu/_base/tdeutils/debian/kmilo-legacy-trinity.install
index afa9d1fed..afa9d1fed 100644
--- a/ubuntu/maverick/tdeutils/debian/kmilo-legacy-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kmilo-legacy-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kmilo-trinity.install b/ubuntu/_base/tdeutils/debian/kmilo-trinity.install
index 1d5b8cb8f..1d5b8cb8f 100644
--- a/ubuntu/maverick/tdeutils/debian/kmilo-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kmilo-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.install b/ubuntu/_base/tdeutils/debian/kregexpeditor-trinity.install
index 10946f5fd..10946f5fd 100644
--- a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/kregexpeditor-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu b/ubuntu/_base/tdeutils/debian/kregexpeditor-trinity.menu
index d88d029df..d88d029df 100644
--- a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/kregexpeditor-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/ksim-trinity.install b/ubuntu/_base/tdeutils/debian/ksim-trinity.install
index c1d00aefc..c1d00aefc 100644
--- a/ubuntu/maverick/tdeutils/debian/ksim-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/ksim-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/ksim-trinity.preinst b/ubuntu/_base/tdeutils/debian/ksim-trinity.preinst
index 71c296dca..71c296dca 100644
--- a/ubuntu/maverick/tdeutils/debian/ksim-trinity.preinst
+++ b/ubuntu/_base/tdeutils/debian/ksim-trinity.preinst
diff --git a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.install b/ubuntu/_base/tdeutils/debian/ktimer-trinity.install
index d2097f244..d2097f244 100644
--- a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/ktimer-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu b/ubuntu/_base/tdeutils/debian/ktimer-trinity.menu
index 0fe0e99a7..0fe0e99a7 100644
--- a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/ktimer-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/man/ark-trinity.1 b/ubuntu/_base/tdeutils/debian/man/ark-trinity.1
index d738284f4..d738284f4 100644
--- a/ubuntu/maverick/tdeutils/debian/man/ark-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/ark-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/kcalc-trinity.1 b/ubuntu/_base/tdeutils/debian/man/kcalc-trinity.1
index eff470650..eff470650 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kcalc-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/kcalc-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/_base/tdeutils/debian/man/kcharselect-trinity.1
index cc54866fa..cc54866fa 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kcharselect-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/kcharselect-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/kdf-trinity.1 b/ubuntu/_base/tdeutils/debian/man/kdf-trinity.1
index 58bbbec90..58bbbec90 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kdf-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/kdf-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/kedit-trinity.1 b/ubuntu/_base/tdeutils/debian/man/kedit-trinity.1
index ebf6a588b..ebf6a588b 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kedit-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/kedit-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/kfloppy-trinity.1 b/ubuntu/_base/tdeutils/debian/man/kfloppy-trinity.1
index 412893a1a..412893a1a 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kfloppy-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/kfloppy-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/kgpg-trinity.1 b/ubuntu/_base/tdeutils/debian/man/kgpg-trinity.1
index 9ea82bb85..9ea82bb85 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kgpg-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/kgpg-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/khexedit-trinity.1 b/ubuntu/_base/tdeutils/debian/man/khexedit-trinity.1
index 968d438f5..968d438f5 100644
--- a/ubuntu/maverick/tdeutils/debian/man/khexedit-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/khexedit-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/kwikdisk-trinity.1 b/ubuntu/_base/tdeutils/debian/man/kwikdisk-trinity.1
index 74aaad6ca..74aaad6ca 100644
--- a/ubuntu/maverick/tdeutils/debian/man/kwikdisk-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/kwikdisk-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/man/superkaramba-trinity.1 b/ubuntu/_base/tdeutils/debian/man/superkaramba-trinity.1
index ab0ec0f49..ab0ec0f49 100644
--- a/ubuntu/maverick/tdeutils/debian/man/superkaramba-trinity.1
+++ b/ubuntu/_base/tdeutils/debian/man/superkaramba-trinity.1
diff --git a/ubuntu/maverick/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/ubuntu/_base/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
index 3837407f6..3837407f6 100644
--- a/ubuntu/maverick/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
+++ b/ubuntu/_base/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
diff --git a/ubuntu/maverick/tdeutils/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdeutils/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdeutils/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdeutils/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdeutils/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdeutils/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdeutils/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdeutils/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdeutils/debian/patches/series b/ubuntu/_base/tdeutils/debian/patches/series
index f4421a4c2..f4421a4c2 100644
--- a/ubuntu/maverick/tdeutils/debian/patches/series
+++ b/ubuntu/_base/tdeutils/debian/patches/series
diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/_base/tdeutils/debian/rules
index 9617d1359..9617d1359 100755
--- a/ubuntu/maverick/tdeutils/debian/rules
+++ b/ubuntu/_base/tdeutils/debian/rules
diff --git a/ubuntu/maverick/tdeutils/debian/source/format b/ubuntu/_base/tdeutils/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdeutils/debian/source/format
+++ b/ubuntu/_base/tdeutils/debian/source/format
diff --git a/ubuntu/maverick/tdeutils/debian/source/options b/ubuntu/_base/tdeutils/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdeutils/debian/source/options
+++ b/ubuntu/_base/tdeutils/debian/source/options
diff --git a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.examples b/ubuntu/_base/tdeutils/debian/superkaramba-trinity.examples
index c02a032d2..c02a032d2 100644
--- a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.examples
+++ b/ubuntu/_base/tdeutils/debian/superkaramba-trinity.examples
diff --git a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.install b/ubuntu/_base/tdeutils/debian/superkaramba-trinity.install
index 12daea5ba..12daea5ba 100644
--- a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/superkaramba-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.manpages b/ubuntu/_base/tdeutils/debian/superkaramba-trinity.manpages
index 730ac7f62..730ac7f62 100644
--- a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.manpages
+++ b/ubuntu/_base/tdeutils/debian/superkaramba-trinity.manpages
diff --git a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu b/ubuntu/_base/tdeutils/debian/superkaramba-trinity.menu
index 781a1e036..781a1e036 100644
--- a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
+++ b/ubuntu/_base/tdeutils/debian/superkaramba-trinity.menu
diff --git a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install b/ubuntu/_base/tdeutils/debian/tdelirc-trinity.install
index 8570e2ffa..8570e2ffa 100644
--- a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/tdelirc-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/_base/tdeutils/debian/tdelirc-trinity.lintian
index 0c89583f3..0c89583f3 100644
--- a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian
+++ b/ubuntu/_base/tdeutils/debian/tdelirc-trinity.lintian
diff --git a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.postinst b/ubuntu/_base/tdeutils/debian/tdelirc-trinity.postinst
index 9119d5017..9119d5017 100644
--- a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.postinst
+++ b/ubuntu/_base/tdeutils/debian/tdelirc-trinity.postinst
diff --git a/ubuntu/maverick/tdeutils/debian/tdessh-trinity.install b/ubuntu/_base/tdeutils/debian/tdessh-trinity.install
index cf26ccd1d..cf26ccd1d 100644
--- a/ubuntu/maverick/tdeutils/debian/tdessh-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/tdessh-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.ark
index 220765a9c..220765a9c 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.ark
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.ark
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
index fe3652e36..fe3652e36 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.irkick
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
index d9dcc4f3b..d9dcc4f3b 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kcalc
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
index 842e918f3..842e918f3 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kcmlirc
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kdf b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kdf
index 6a664155b..6a664155b 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kdf
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kdf
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
index 8be898e14..8be898e14 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kedit
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy
index 5c0f071fb..5c0f071fb 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kfloppy
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg
index 5f176e443..5f176e443 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kgpg
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
index 2c4b8cf8d..2c4b8cf8d 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.khexedit
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kjots b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kjots
index 753a35e4f..753a35e4f 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kjots
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kjots
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor
index a0bd5f21d..a0bd5f21d 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.kregexpeditor
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
index 9d4a685ac..9d4a685ac 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.superkaramba
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet
index 4f7948078..4f7948078 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-doc-html.doc-base.tdewallet
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install b/ubuntu/_base/tdeutils/debian/tdeutils-trinity-dev.install
index 17a626fcf..17a626fcf 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-trinity-dev.install
diff --git a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-doc.install b/ubuntu/_base/tdeutils/debian/tdeutils-trinity-doc.install
index 745e17452..745e17452 100644
--- a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-doc.install
+++ b/ubuntu/_base/tdeutils/debian/tdeutils-trinity-doc.install
diff --git a/ubuntu/maverick/tdeutils/debian/tdewalletmanager-trinity.install b/ubuntu/_base/tdeutils/debian/tdewalletmanager-trinity.install
index 6e75bf792..6e75bf792 100644
--- a/ubuntu/maverick/tdeutils/debian/tdewalletmanager-trinity.install
+++ b/ubuntu/_base/tdeutils/debian/tdewalletmanager-trinity.install
diff --git a/ubuntu/maverick/tdevelop/debian/README.Debian b/ubuntu/_base/tdevelop/debian/README.Debian
index 5979808ec..5979808ec 100644
--- a/ubuntu/maverick/tdevelop/debian/README.Debian
+++ b/ubuntu/_base/tdevelop/debian/README.Debian
diff --git a/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdevelop/debian/cdbs/debian-qt-kde.mk
index 14dce59aa..14dce59aa 100644
--- a/ubuntu/maverick/tdevelop/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdevelop/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk b/ubuntu/_base/tdevelop/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdevelop/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdevelop/debian/cdbs/versions.pl b/ubuntu/_base/tdevelop/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdevelop/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdevelop/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdevelop/debian/changelog b/ubuntu/_base/tdevelop/debian/changelog
index 526fc52c7..526fc52c7 100644
--- a/ubuntu/maverick/tdevelop/debian/changelog
+++ b/ubuntu/_base/tdevelop/debian/changelog
diff --git a/ubuntu/maverick/tdevelop/debian/compat b/ubuntu/_base/tdevelop/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdevelop/debian/compat
+++ b/ubuntu/_base/tdevelop/debian/compat
diff --git a/ubuntu/maverick/tdevelop/debian/control b/ubuntu/_base/tdevelop/debian/control
index 9879b9db4..9879b9db4 100644
--- a/ubuntu/maverick/tdevelop/debian/control
+++ b/ubuntu/_base/tdevelop/debian/control
diff --git a/ubuntu/maverick/tdevelop/debian/copyright b/ubuntu/_base/tdevelop/debian/copyright
index 04553bfac..04553bfac 100644
--- a/ubuntu/maverick/tdevelop/debian/copyright
+++ b/ubuntu/_base/tdevelop/debian/copyright
diff --git a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install b/ubuntu/_base/tdevelop/debian/kdevdesigner-trinity.install
index e57f4a7b3..e57f4a7b3 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install
+++ b/ubuntu/_base/tdevelop/debian/kdevdesigner-trinity.install
diff --git a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.manpages b/ubuntu/_base/tdevelop/debian/kdevdesigner-trinity.manpages
index d7d59e386..d7d59e386 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.manpages
+++ b/ubuntu/_base/tdevelop/debian/kdevdesigner-trinity.manpages
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdeopt.part b/ubuntu/_base/tdevelop/debian/man/kdeopt.part
index 661b4591d..661b4591d 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdeopt.part
+++ b/ubuntu/_base/tdevelop/debian/man/kdeopt.part
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevassistant.man b/ubuntu/_base/tdevelop/debian/man/kdevassistant.man
index 05cfbd56e..05cfbd56e 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdevassistant.man
+++ b/ubuntu/_base/tdevelop/debian/man/kdevassistant.man
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevdesigner.man b/ubuntu/_base/tdevelop/debian/man/kdevdesigner.man
index 43197dbbc..43197dbbc 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdevdesigner.man
+++ b/ubuntu/_base/tdevelop/debian/man/kdevdesigner.man
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevprj2kdevelop.man b/ubuntu/_base/tdevelop/debian/man/kdevprj2kdevelop.man
index c3e3950f1..c3e3950f1 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdevprj2kdevelop.man
+++ b/ubuntu/_base/tdevelop/debian/man/kdevprj2kdevelop.man
diff --git a/ubuntu/maverick/tdevelop/debian/man/kdevprofileeditor.man b/ubuntu/_base/tdevelop/debian/man/kdevprofileeditor.man
index d33adfb50..d33adfb50 100644
--- a/ubuntu/maverick/tdevelop/debian/man/kdevprofileeditor.man
+++ b/ubuntu/_base/tdevelop/debian/man/kdevprofileeditor.man
diff --git a/ubuntu/maverick/tdevelop/debian/man/tdevelop-htdig.man b/ubuntu/_base/tdevelop/debian/man/tdevelop-htdig.man
index 61ddc8ad7..61ddc8ad7 100644
--- a/ubuntu/maverick/tdevelop/debian/man/tdevelop-htdig.man
+++ b/ubuntu/_base/tdevelop/debian/man/tdevelop-htdig.man
diff --git a/ubuntu/maverick/tdevelop/debian/man/tdevelop.man b/ubuntu/_base/tdevelop/debian/man/tdevelop.man
index 43e342e6e..43e342e6e 100644
--- a/ubuntu/maverick/tdevelop/debian/man/tdevelop.man
+++ b/ubuntu/_base/tdevelop/debian/man/tdevelop.man
diff --git a/ubuntu/maverick/tdevelop/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/tdevelop/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/tdevelop/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/tdevelop/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/tdevelop/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/tdevelop/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
index 39dd7745e..39dd7745e 100644
--- a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdevelop/debian/patches/series b/ubuntu/_base/tdevelop/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/tdevelop/debian/patches/series
+++ b/ubuntu/_base/tdevelop/debian/patches/series
diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/_base/tdevelop/debian/rules
index ebb5428b2..ebb5428b2 100755
--- a/ubuntu/maverick/tdevelop/debian/rules
+++ b/ubuntu/_base/tdevelop/debian/rules
diff --git a/ubuntu/maverick/tdevelop/debian/source.lintian-overrides b/ubuntu/_base/tdevelop/debian/source.lintian-overrides
index 4aed86542..4aed86542 100644
--- a/ubuntu/maverick/tdevelop/debian/source.lintian-overrides
+++ b/ubuntu/_base/tdevelop/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/tdevelop/debian/source/format b/ubuntu/_base/tdevelop/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdevelop/debian/source/format
+++ b/ubuntu/_base/tdevelop/debian/source/format
diff --git a/ubuntu/maverick/tdevelop/debian/source/options b/ubuntu/_base/tdevelop/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdevelop/debian/source/options
+++ b/ubuntu/_base/tdevelop/debian/source/options
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.install b/ubuntu/_base/tdevelop/debian/tdevelop-data-trinity.install
index 70e2f0ebc..70e2f0ebc 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.install
+++ b/ubuntu/_base/tdevelop/debian/tdevelop-data-trinity.install
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian b/ubuntu/_base/tdevelop/debian/tdevelop-data-trinity.lintian
index 91e79108d..91e79108d 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/ubuntu/_base/tdevelop/debian/tdevelop-data-trinity.lintian
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install b/ubuntu/_base/tdevelop/debian/tdevelop-trinity-dev.install
index a8813a5e2..a8813a5e2 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install
+++ b/ubuntu/_base/tdevelop/debian/tdevelop-trinity-dev.install
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install b/ubuntu/_base/tdevelop/debian/tdevelop-trinity-doc.install
index 4b1da9772..4b1da9772 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-doc.install
+++ b/ubuntu/_base/tdevelop/debian/tdevelop-trinity-doc.install
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install b/ubuntu/_base/tdevelop/debian/tdevelop-trinity.install
index bf349800a..bf349800a 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
+++ b/ubuntu/_base/tdevelop/debian/tdevelop-trinity.install
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages b/ubuntu/_base/tdevelop/debian/tdevelop-trinity.manpages
index 11c38318d..11c38318d 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
+++ b/ubuntu/_base/tdevelop/debian/tdevelop-trinity.manpages
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu b/ubuntu/_base/tdevelop/debian/tdevelop-trinity.menu
index fc4e48b0c..fc4e48b0c 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu
+++ b/ubuntu/_base/tdevelop/debian/tdevelop-trinity.menu
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop.xpm b/ubuntu/_base/tdevelop/debian/tdevelop.xpm
index ae07ff13a..ae07ff13a 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop.xpm
+++ b/ubuntu/_base/tdevelop/debian/tdevelop.xpm
diff --git a/ubuntu/maverick/tdevelop/debian/watch b/ubuntu/_base/tdevelop/debian/watch
index 18344a41a..18344a41a 100644
--- a/ubuntu/maverick/tdevelop/debian/watch
+++ b/ubuntu/_base/tdevelop/debian/watch
diff --git a/ubuntu/maverick/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
index a81b1de92..a81b1de92 100644
--- a/ubuntu/maverick/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/tdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/tdewebdev/debian/cdbs/debian-qt-kde.mk
index 91a547ea9..91a547ea9 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/tdewebdev/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk b/ubuntu/_base/tdewebdev/debian/cdbs/kde.mk
index 1ac26c4b7..1ac26c4b7 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk
+++ b/ubuntu/_base/tdewebdev/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/versions.pl b/ubuntu/_base/tdewebdev/debian/cdbs/versions.pl
index 1b110f7af..1b110f7af 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/versions.pl
+++ b/ubuntu/_base/tdewebdev/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/tdewebdev/debian/changelog b/ubuntu/_base/tdewebdev/debian/changelog
index a85415bed..a85415bed 100644
--- a/ubuntu/maverick/tdewebdev/debian/changelog
+++ b/ubuntu/_base/tdewebdev/debian/changelog
diff --git a/ubuntu/maverick/tdewebdev/debian/compat b/ubuntu/_base/tdewebdev/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/tdewebdev/debian/compat
+++ b/ubuntu/_base/tdewebdev/debian/compat
diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/_base/tdewebdev/debian/control
index 00f62c1ba..00f62c1ba 100644
--- a/ubuntu/maverick/tdewebdev/debian/control
+++ b/ubuntu/_base/tdewebdev/debian/control
diff --git a/ubuntu/maverick/tdewebdev/debian/copyright b/ubuntu/_base/tdewebdev/debian/copyright
index 8ae0e05d3..8ae0e05d3 100644
--- a/ubuntu/maverick/tdewebdev/debian/copyright
+++ b/ubuntu/_base/tdewebdev/debian/copyright
diff --git a/ubuntu/maverick/tdewebdev/debian/docrc/css.docrc b/ubuntu/_base/tdewebdev/debian/docrc/css.docrc
index 688271b94..688271b94 100644
--- a/ubuntu/maverick/tdewebdev/debian/docrc/css.docrc
+++ b/ubuntu/_base/tdewebdev/debian/docrc/css.docrc
diff --git a/ubuntu/maverick/tdewebdev/debian/docrc/docbook.docrc b/ubuntu/_base/tdewebdev/debian/docrc/docbook.docrc
index 2cc0b658b..2cc0b658b 100644
--- a/ubuntu/maverick/tdewebdev/debian/docrc/docbook.docrc
+++ b/ubuntu/_base/tdewebdev/debian/docrc/docbook.docrc
diff --git a/ubuntu/maverick/tdewebdev/debian/docrc/html.docrc b/ubuntu/_base/tdewebdev/debian/docrc/html.docrc
index 9361e5eee..9361e5eee 100644
--- a/ubuntu/maverick/tdewebdev/debian/docrc/html.docrc
+++ b/ubuntu/_base/tdewebdev/debian/docrc/html.docrc
diff --git a/ubuntu/maverick/tdewebdev/debian/docrc/php.docrc b/ubuntu/_base/tdewebdev/debian/docrc/php.docrc
index 7ff67ec65..7ff67ec65 100644
--- a/ubuntu/maverick/tdewebdev/debian/docrc/php.docrc
+++ b/ubuntu/_base/tdewebdev/debian/docrc/php.docrc
diff --git a/ubuntu/maverick/tdewebdev/debian/icons/kimagemapeditor.xpm b/ubuntu/_base/tdewebdev/debian/icons/kimagemapeditor.xpm
index 8a24150d2..8a24150d2 100644
--- a/ubuntu/maverick/tdewebdev/debian/icons/kimagemapeditor.xpm
+++ b/ubuntu/_base/tdewebdev/debian/icons/kimagemapeditor.xpm
diff --git a/ubuntu/maverick/tdewebdev/debian/icons/klinkstatus.xpm b/ubuntu/_base/tdewebdev/debian/icons/klinkstatus.xpm
index 8f17fbf3d..8f17fbf3d 100644
--- a/ubuntu/maverick/tdewebdev/debian/icons/klinkstatus.xpm
+++ b/ubuntu/_base/tdewebdev/debian/icons/klinkstatus.xpm
diff --git a/ubuntu/maverick/tdewebdev/debian/icons/quanta.xpm b/ubuntu/_base/tdewebdev/debian/icons/quanta.xpm
index 659a3ff99..659a3ff99 100644
--- a/ubuntu/maverick/tdewebdev/debian/icons/quanta.xpm
+++ b/ubuntu/_base/tdewebdev/debian/icons/quanta.xpm
diff --git a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.docs b/ubuntu/_base/tdewebdev/debian/kimagemapeditor-trinity.docs
index fcf97a3eb..fcf97a3eb 100644
--- a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.docs
+++ b/ubuntu/_base/tdewebdev/debian/kimagemapeditor-trinity.docs
diff --git a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.install b/ubuntu/_base/tdewebdev/debian/kimagemapeditor-trinity.install
index 947588c76..947588c76 100644
--- a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.install
+++ b/ubuntu/_base/tdewebdev/debian/kimagemapeditor-trinity.install
diff --git a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.manpages b/ubuntu/_base/tdewebdev/debian/kimagemapeditor-trinity.manpages
index e9fdcdb20..e9fdcdb20 100644
--- a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.manpages
+++ b/ubuntu/_base/tdewebdev/debian/kimagemapeditor-trinity.manpages
diff --git a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.menu b/ubuntu/_base/tdewebdev/debian/kimagemapeditor-trinity.menu
index c06259dfe..c06259dfe 100644
--- a/ubuntu/maverick/tdewebdev/debian/kimagemapeditor-trinity.menu
+++ b/ubuntu/_base/tdewebdev/debian/kimagemapeditor-trinity.menu
diff --git a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.README.Debian
index 418ec3c6c..418ec3c6c 100644
--- a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.README.Debian
+++ b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.README.Debian
diff --git a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.docs b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.docs
index c1da674ec..c1da674ec 100644
--- a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.docs
+++ b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.docs
diff --git a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.install b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install
index 9c6c7048d..9c6c7048d 100644
--- a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.install
+++ b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install
diff --git a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.manpages b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.manpages
index 0a9e537e1..0a9e537e1 100644
--- a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.manpages
+++ b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.manpages
diff --git a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.menu b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.menu
index 2efac007a..2efac007a 100644
--- a/ubuntu/maverick/tdewebdev/debian/klinkstatus-trinity.menu
+++ b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.menu
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.docs b/ubuntu/_base/tdewebdev/debian/kommander-trinity-dev.docs
index 2ea0142a2..2ea0142a2 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.docs
+++ b/ubuntu/_base/tdewebdev/debian/kommander-trinity-dev.docs
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install b/ubuntu/_base/tdewebdev/debian/kommander-trinity-dev.install
index 8d8db707b..8d8db707b 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install
+++ b/ubuntu/_base/tdewebdev/debian/kommander-trinity-dev.install
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian b/ubuntu/_base/tdewebdev/debian/kommander-trinity.README.Debian
index 09e21de46..09e21de46 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.README.Debian
+++ b/ubuntu/_base/tdewebdev/debian/kommander-trinity.README.Debian
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.docs b/ubuntu/_base/tdewebdev/debian/kommander-trinity.docs
index 2ea0142a2..2ea0142a2 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.docs
+++ b/ubuntu/_base/tdewebdev/debian/kommander-trinity.docs
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install b/ubuntu/_base/tdewebdev/debian/kommander-trinity.install
index 1f10fc6c2..1f10fc6c2 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.install
+++ b/ubuntu/_base/tdewebdev/debian/kommander-trinity.install
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.manpages b/ubuntu/_base/tdewebdev/debian/kommander-trinity.manpages
index 718a10f1e..718a10f1e 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.manpages
+++ b/ubuntu/_base/tdewebdev/debian/kommander-trinity.manpages
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.menu b/ubuntu/_base/tdewebdev/debian/kommander-trinity.menu
index 327a831a9..327a831a9 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.menu
+++ b/ubuntu/_base/tdewebdev/debian/kommander-trinity.menu
diff --git a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.shlibs b/ubuntu/_base/tdewebdev/debian/kommander-trinity.shlibs
index 92ae6b607..92ae6b607 100644
--- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity.shlibs
+++ b/ubuntu/_base/tdewebdev/debian/kommander-trinity.shlibs
diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian b/ubuntu/_base/tdewebdev/debian/kxsldbg-trinity.README.Debian
index 447ce09a8..447ce09a8 100644
--- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.README.Debian
+++ b/ubuntu/_base/tdewebdev/debian/kxsldbg-trinity.README.Debian
diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install b/ubuntu/_base/tdewebdev/debian/kxsldbg-trinity.install
index 28d1bba41..28d1bba41 100644
--- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install
+++ b/ubuntu/_base/tdewebdev/debian/kxsldbg-trinity.install
diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.manpages b/ubuntu/_base/tdewebdev/debian/kxsldbg-trinity.manpages
index c56e17491..c56e17491 100644
--- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.manpages
+++ b/ubuntu/_base/tdewebdev/debian/kxsldbg-trinity.manpages
diff --git a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.menu b/ubuntu/_base/tdewebdev/debian/kxsldbg-trinity.menu
index 685853031..685853031 100644
--- a/ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.menu
+++ b/ubuntu/_base/tdewebdev/debian/kxsldbg-trinity.menu
diff --git a/ubuntu/maverick/tdewebdev/debian/man/extractkmdr-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/extractkmdr-trinity.1
index 5dfad28d7..5dfad28d7 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/extractkmdr-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/extractkmdr-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kimagemapeditor-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/kimagemapeditor-trinity.1
index 681db952f..681db952f 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kimagemapeditor-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/kimagemapeditor-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/klinkstatus-trinity.1
index c1b2b61b0..c1b2b61b0 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/klinkstatus-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/klinkstatus-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/kmdr-editor-trinity.1
index 5ecb637c8..5ecb637c8 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-editor-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/kmdr-editor-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/kmdr-executor-trinity.1
index cc197d69f..cc197d69f 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-executor-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/kmdr-executor-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/kmdr-plugins-trinity.1
index 5a8d222bf..5a8d222bf 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr-plugins-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/kmdr-plugins-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kmdr2po-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/kmdr2po-trinity.1
index 4693644e4..4693644e4 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kmdr2po-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/kmdr2po-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/kxsldbg-trinity.1
index 11b551f69..11b551f69 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/kxsldbg-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/kxsldbg-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/quanta-trinity.1
index 5640297b9..5640297b9 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/quanta-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/quanta-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/man/tdefilereplace-trinity.1 b/ubuntu/_base/tdewebdev/debian/man/tdefilereplace-trinity.1
index 63557c928..63557c928 100644
--- a/ubuntu/maverick/tdewebdev/debian/man/tdefilereplace-trinity.1
+++ b/ubuntu/_base/tdewebdev/debian/man/tdefilereplace-trinity.1
diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/README b/ubuntu/_base/tdewebdev/debian/patches/common/README
index 9e81cc359..9e81cc359 100644
--- a/ubuntu/maverick/tdewebdev/debian/patches/common/README
+++ b/ubuntu/_base/tdewebdev/debian/patches/common/README
diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
index 28c95742b..28c95742b 100644
--- a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/tdewebdev/debian/patches/series b/ubuntu/_base/tdewebdev/debian/patches/series
index 8f8f0bd6b..8f8f0bd6b 100644
--- a/ubuntu/maverick/tdewebdev/debian/patches/series
+++ b/ubuntu/_base/tdewebdev/debian/patches/series
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.README.Debian b/ubuntu/_base/tdewebdev/debian/quanta-data-trinity.README.Debian
index b64da44cf..b64da44cf 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.README.Debian
+++ b/ubuntu/_base/tdewebdev/debian/quanta-data-trinity.README.Debian
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.docs b/ubuntu/_base/tdewebdev/debian/quanta-data-trinity.docs
index 39f0afb3c..39f0afb3c 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.docs
+++ b/ubuntu/_base/tdewebdev/debian/quanta-data-trinity.docs
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.install b/ubuntu/_base/tdewebdev/debian/quanta-data-trinity.install
index d02d0d9c7..d02d0d9c7 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.install
+++ b/ubuntu/_base/tdewebdev/debian/quanta-data-trinity.install
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.lintian b/ubuntu/_base/tdewebdev/debian/quanta-data-trinity.lintian
index 1b1814f88..1b1814f88 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.lintian
+++ b/ubuntu/_base/tdewebdev/debian/quanta-data-trinity.lintian
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian b/ubuntu/_base/tdewebdev/debian/quanta-trinity.README.Debian
index 5cef23803..5cef23803 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.README.Debian
+++ b/ubuntu/_base/tdewebdev/debian/quanta-trinity.README.Debian
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.docs b/ubuntu/_base/tdewebdev/debian/quanta-trinity.docs
index 39f0afb3c..39f0afb3c 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.docs
+++ b/ubuntu/_base/tdewebdev/debian/quanta-trinity.docs
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.install b/ubuntu/_base/tdewebdev/debian/quanta-trinity.install
index 0d06b0bac..0d06b0bac 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.install
+++ b/ubuntu/_base/tdewebdev/debian/quanta-trinity.install
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.links b/ubuntu/_base/tdewebdev/debian/quanta-trinity.links
index a512db79b..a512db79b 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.links
+++ b/ubuntu/_base/tdewebdev/debian/quanta-trinity.links
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian b/ubuntu/_base/tdewebdev/debian/quanta-trinity.lintian
index b478ff37a..b478ff37a 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian
+++ b/ubuntu/_base/tdewebdev/debian/quanta-trinity.lintian
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.manpages b/ubuntu/_base/tdewebdev/debian/quanta-trinity.manpages
index e4b4a816c..e4b4a816c 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.manpages
+++ b/ubuntu/_base/tdewebdev/debian/quanta-trinity.manpages
diff --git a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.menu b/ubuntu/_base/tdewebdev/debian/quanta-trinity.menu
index eb664f95c..eb664f95c 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.menu
+++ b/ubuntu/_base/tdewebdev/debian/quanta-trinity.menu
diff --git a/ubuntu/maverick/tdewebdev/debian/rules b/ubuntu/_base/tdewebdev/debian/rules
index 60c404811..60c404811 100755
--- a/ubuntu/maverick/tdewebdev/debian/rules
+++ b/ubuntu/_base/tdewebdev/debian/rules
diff --git a/ubuntu/maverick/tdewebdev/debian/source/format b/ubuntu/_base/tdewebdev/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/tdewebdev/debian/source/format
+++ b/ubuntu/_base/tdewebdev/debian/source/format
diff --git a/ubuntu/maverick/tdewebdev/debian/source/options b/ubuntu/_base/tdewebdev/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/tdewebdev/debian/source/options
+++ b/ubuntu/_base/tdewebdev/debian/source/options
diff --git a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.README.Debian b/ubuntu/_base/tdewebdev/debian/tdefilereplace-trinity.README.Debian
index b2f7ce2da..b2f7ce2da 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.README.Debian
+++ b/ubuntu/_base/tdewebdev/debian/tdefilereplace-trinity.README.Debian
diff --git a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.install b/ubuntu/_base/tdewebdev/debian/tdefilereplace-trinity.install
index 515142b40..515142b40 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.install
+++ b/ubuntu/_base/tdewebdev/debian/tdefilereplace-trinity.install
diff --git a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.manpages b/ubuntu/_base/tdewebdev/debian/tdefilereplace-trinity.manpages
index 694a538a0..694a538a0 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdefilereplace-trinity.manpages
+++ b/ubuntu/_base/tdewebdev/debian/tdefilereplace-trinity.manpages
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
index c851b8204..c851b8204 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
+++ b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.klinkstatus
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander
index 233657324..233657324 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander
+++ b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.kommander
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg
index 2f14db1f4..2f14db1f4 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg
+++ b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.kxsldbg
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta
index 6d8e92956..6d8e92956 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta
+++ b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.quanta
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.tdefilereplace b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.tdefilereplace
index 54489def9..54489def9 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.tdefilereplace
+++ b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.tdefilereplace
diff --git a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg
index e4147f24f..e4147f24f 100644
--- a/ubuntu/maverick/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg
+++ b/ubuntu/_base/tdewebdev/debian/tdewebdev-doc-html.doc-base.xsldbg
diff --git a/ubuntu/artful b/ubuntu/artful
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/artful
+++ b/ubuntu/artful
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/bionic b/ubuntu/bionic
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/bionic
+++ b/ubuntu/bionic
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/cosmic b/ubuntu/cosmic
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/cosmic
+++ b/ubuntu/cosmic
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/lucid b/ubuntu/lucid
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/lucid
+++ b/ubuntu/lucid
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/maverick b/ubuntu/maverick
new file mode 120000
index 000000000..e7c887a6f
--- /dev/null
+++ b/ubuntu/maverick
@@ -0,0 +1 @@
+_base
\ No newline at end of file
diff --git a/ubuntu/natty b/ubuntu/natty
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/natty
+++ b/ubuntu/natty
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/oneiric b/ubuntu/oneiric
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/oneiric
+++ b/ubuntu/oneiric
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/precise b/ubuntu/precise
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/precise
+++ b/ubuntu/precise
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/quantal b/ubuntu/quantal
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/quantal
+++ b/ubuntu/quantal
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/raring b/ubuntu/raring
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/raring
+++ b/ubuntu/raring
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/saucy b/ubuntu/saucy
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/saucy
+++ b/ubuntu/saucy
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/trusty b/ubuntu/trusty
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/trusty
+++ b/ubuntu/trusty
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/utopic b/ubuntu/utopic
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/utopic
+++ b/ubuntu/utopic
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/vivid b/ubuntu/vivid
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/vivid
+++ b/ubuntu/vivid
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/wily b/ubuntu/wily
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/wily
+++ b/ubuntu/wily
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/xenial b/ubuntu/xenial
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/xenial
+++ b/ubuntu/xenial
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/yakkety b/ubuntu/yakkety
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/yakkety
+++ b/ubuntu/yakkety
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file
diff --git a/ubuntu/zesty b/ubuntu/zesty
index 5cb6e6000..e7c887a6f 120000
--- a/ubuntu/zesty
+++ b/ubuntu/zesty
@@ -1 +1 @@
-maverick
\ No newline at end of file
+_base
\ No newline at end of file