DEB: use _base folder for a distro instead of specific distros (squeeze and maverick).

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

11060 files changed, 9 insertions, 7 deletions

diff --git a/debian/squeeze/applications/abakus/debian/abakus-trinity.manpages b/debian/_base/applications/abakus/debian/abakus-trinity.manpages
index 0737a321e..0737a321e 100644
--- a/debian/squeeze/applications/abakus/debian/abakus-trinity.manpages
+++ b/debian/_base/applications/abakus/debian/abakus-trinity.manpages
diff --git a/debian/squeeze/applications/abakus/debian/abakus-trinity.menu b/debian/_base/applications/abakus/debian/abakus-trinity.menu
index fb1dcd130..fb1dcd130 100644
--- a/debian/squeeze/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/_base/applications/abakus/debian/abakus-trinity.menu
diff --git a/debian/squeeze/applications/abakus/debian/abakus.1 b/debian/_base/applications/abakus/debian/abakus.1
index 74afe7056..74afe7056 100644
--- a/debian/squeeze/applications/abakus/debian/abakus.1
+++ b/debian/_base/applications/abakus/debian/abakus.1
diff --git a/debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/abakus/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/abakus/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/abakus/debian/cdbs/kde.mk b/debian/_base/applications/abakus/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/abakus/debian/cdbs/kde.mk
+++ b/debian/_base/applications/abakus/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/abakus/debian/cdbs/versions.pl b/debian/_base/applications/abakus/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/abakus/debian/cdbs/versions.pl
+++ b/debian/_base/applications/abakus/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/abakus/debian/changelog b/debian/_base/applications/abakus/debian/changelog
index 4bca3dc33..4bca3dc33 100644
--- a/debian/squeeze/applications/abakus/debian/changelog
+++ b/debian/_base/applications/abakus/debian/changelog
diff --git a/debian/squeeze/applications/abakus/debian/compat b/debian/_base/applications/abakus/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/abakus/debian/compat
+++ b/debian/_base/applications/abakus/debian/compat
diff --git a/debian/squeeze/applications/abakus/debian/control b/debian/_base/applications/abakus/debian/control
index 8b9b7b565..8b9b7b565 100644
--- a/debian/squeeze/applications/abakus/debian/control
+++ b/debian/_base/applications/abakus/debian/control
diff --git a/debian/squeeze/applications/abakus/debian/copyright b/debian/_base/applications/abakus/debian/copyright
index 5d11ec083..5d11ec083 100644
--- a/debian/squeeze/applications/abakus/debian/copyright
+++ b/debian/_base/applications/abakus/debian/copyright
diff --git a/debian/squeeze/applications/abakus/debian/docs b/debian/_base/applications/abakus/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/applications/abakus/debian/docs
+++ b/debian/_base/applications/abakus/debian/docs
diff --git a/debian/squeeze/applications/abakus/debian/patches/series b/debian/_base/applications/abakus/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/abakus/debian/patches/series
+++ b/debian/_base/applications/abakus/debian/patches/series
diff --git a/debian/squeeze/applications/abakus/debian/rules b/debian/_base/applications/abakus/debian/rules
index 7f037b23e..7f037b23e 100755
--- a/debian/squeeze/applications/abakus/debian/rules
+++ b/debian/_base/applications/abakus/debian/rules
diff --git a/debian/squeeze/applications/abakus/debian/source/format b/debian/_base/applications/abakus/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/abakus/debian/source/format
+++ b/debian/_base/applications/abakus/debian/source/format
diff --git a/debian/squeeze/applications/abakus/debian/source/options b/debian/_base/applications/abakus/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/abakus/debian/source/options
+++ b/debian/_base/applications/abakus/debian/source/options
diff --git a/debian/squeeze/applications/adept/debian/adept-batch-trinity.install b/debian/_base/applications/adept/debian/adept-batch-trinity.install
index 7f2ac31a4..7f2ac31a4 100644
--- a/debian/squeeze/applications/adept/debian/adept-batch-trinity.install
+++ b/debian/_base/applications/adept/debian/adept-batch-trinity.install
diff --git a/debian/squeeze/applications/adept/debian/adept-common-trinity.install b/debian/_base/applications/adept/debian/adept-common-trinity.install
index 535c10c7d..535c10c7d 100644
--- a/debian/squeeze/applications/adept/debian/adept-common-trinity.install
+++ b/debian/_base/applications/adept/debian/adept-common-trinity.install
diff --git a/debian/squeeze/applications/adept/debian/adept-installer-trinity.install b/debian/_base/applications/adept/debian/adept-installer-trinity.install
index a3de6d18c..a3de6d18c 100644
--- a/debian/squeeze/applications/adept/debian/adept-installer-trinity.install
+++ b/debian/_base/applications/adept/debian/adept-installer-trinity.install
diff --git a/debian/squeeze/applications/adept/debian/adept-manager-trinity.install b/debian/_base/applications/adept/debian/adept-manager-trinity.install
index 35fc0712b..35fc0712b 100644
--- a/debian/squeeze/applications/adept/debian/adept-manager-trinity.install
+++ b/debian/_base/applications/adept/debian/adept-manager-trinity.install
diff --git a/debian/squeeze/applications/adept/debian/adept-notifier-trinity.install b/debian/_base/applications/adept/debian/adept-notifier-trinity.install
index b1e97afac..b1e97afac 100644
--- a/debian/squeeze/applications/adept/debian/adept-notifier-trinity.install
+++ b/debian/_base/applications/adept/debian/adept-notifier-trinity.install
diff --git a/debian/squeeze/applications/adept/debian/adept-updater-trinity.install b/debian/_base/applications/adept/debian/adept-updater-trinity.install
index 0be740892..0be740892 100644
--- a/debian/squeeze/applications/adept/debian/adept-updater-trinity.install
+++ b/debian/_base/applications/adept/debian/adept-updater-trinity.install
diff --git a/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/adept/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/adept/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/adept/debian/cdbs/kde.mk b/debian/_base/applications/adept/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/adept/debian/cdbs/kde.mk
+++ b/debian/_base/applications/adept/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/adept/debian/cdbs/versions.pl b/debian/_base/applications/adept/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/adept/debian/cdbs/versions.pl
+++ b/debian/_base/applications/adept/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/adept/debian/changelog b/debian/_base/applications/adept/debian/changelog
index 58496db32..58496db32 100644
--- a/debian/squeeze/applications/adept/debian/changelog
+++ b/debian/_base/applications/adept/debian/changelog
diff --git a/debian/squeeze/applications/adept/debian/compat b/debian/_base/applications/adept/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/adept/debian/compat
+++ b/debian/_base/applications/adept/debian/compat
diff --git a/debian/squeeze/applications/adept/debian/control b/debian/_base/applications/adept/debian/control
index 490c3e103..490c3e103 100644
--- a/debian/squeeze/applications/adept/debian/control
+++ b/debian/_base/applications/adept/debian/control
diff --git a/debian/squeeze/applications/adept/debian/copyright b/debian/_base/applications/adept/debian/copyright
index 6f8ad6648..6f8ad6648 100644
--- a/debian/squeeze/applications/adept/debian/copyright
+++ b/debian/_base/applications/adept/debian/copyright
diff --git a/debian/squeeze/applications/adept/debian/dirs b/debian/_base/applications/adept/debian/dirs
index 73752c9ae..73752c9ae 100644
--- a/debian/squeeze/applications/adept/debian/dirs
+++ b/debian/_base/applications/adept/debian/dirs
diff --git a/debian/squeeze/applications/adept/debian/docs b/debian/_base/applications/adept/debian/docs
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/adept/debian/docs
+++ b/debian/_base/applications/adept/debian/docs
diff --git a/debian/squeeze/applications/adept/debian/patches/remove_apport.diff b/debian/_base/applications/adept/debian/patches/remove_apport.diff
index e768486eb..e768486eb 100644
--- a/debian/squeeze/applications/adept/debian/patches/remove_apport.diff
+++ b/debian/_base/applications/adept/debian/patches/remove_apport.diff
diff --git a/debian/squeeze/applications/adept/debian/patches/series b/debian/_base/applications/adept/debian/patches/series
index ad5b05138..ad5b05138 100644
--- a/debian/squeeze/applications/adept/debian/patches/series
+++ b/debian/_base/applications/adept/debian/patches/series
diff --git a/debian/squeeze/applications/adept/debian/rules b/debian/_base/applications/adept/debian/rules
index 2618af2fc..2618af2fc 100755
--- a/debian/squeeze/applications/adept/debian/rules
+++ b/debian/_base/applications/adept/debian/rules
diff --git a/debian/squeeze/applications/adept/debian/source/format b/debian/_base/applications/adept/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/adept/debian/source/format
+++ b/debian/_base/applications/adept/debian/source/format
diff --git a/debian/squeeze/applications/adept/debian/source/options b/debian/_base/applications/adept/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/adept/debian/source/options
+++ b/debian/_base/applications/adept/debian/source/options
diff --git a/debian/squeeze/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..ca324be99 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/applications/amarok.cmake/debian/README.Debian b/debian/_base/applications/amarok.cmake/debian/README.Debian
index 7dc17fb17..7dc17fb17 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/README.Debian
+++ b/debian/_base/applications/amarok.cmake/debian/README.Debian
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok-common-trinity.install b/debian/_base/applications/amarok.cmake/debian/amarok-common-trinity.install
index 3b473baa0..3b473baa0 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-common-trinity.install
+++ b/debian/_base/applications/amarok.cmake/debian/amarok-common-trinity.install
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install b/debian/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
index c5e46604f..c5e46604f 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
+++ b/debian/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install b/debian/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
index ab71ca6f9..ab71ca6f9 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
+++ b/debian/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.install b/debian/_base/applications/amarok.cmake/debian/amarok-trinity.install
index f5aeb567f..f5aeb567f 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.install
+++ b/debian/_base/applications/amarok.cmake/debian/amarok-trinity.install
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.manpages b/debian/_base/applications/amarok.cmake/debian/amarok-trinity.manpages
index 8094eebb9..8094eebb9 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.manpages
+++ b/debian/_base/applications/amarok.cmake/debian/amarok-trinity.manpages
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/_base/applications/amarok.cmake/debian/amarok-trinity.menu
index f78ef6060..f78ef6060 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/debian/_base/applications/amarok.cmake/debian/amarok-trinity.menu
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok_play_audiocd.desktop b/debian/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
index 434630b60..434630b60 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
+++ b/debian/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
diff --git a/debian/squeeze/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
index 2dff59226..2dff59226 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/amarok.cmake/debian/cdbs/kde.mk b/debian/_base/applications/amarok.cmake/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/cdbs/kde.mk
+++ b/debian/_base/applications/amarok.cmake/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/amarok.cmake/debian/cdbs/versions.pl b/debian/_base/applications/amarok.cmake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/debian/_base/applications/amarok.cmake/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/amarok.cmake/debian/changelog b/debian/_base/applications/amarok.cmake/debian/changelog
index dfc13c56b..dfc13c56b 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/changelog
+++ b/debian/_base/applications/amarok.cmake/debian/changelog
diff --git a/debian/squeeze/applications/amarok.cmake/debian/compat b/debian/_base/applications/amarok.cmake/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/compat
+++ b/debian/_base/applications/amarok.cmake/debian/compat
diff --git a/debian/squeeze/applications/amarok.cmake/debian/control b/debian/_base/applications/amarok.cmake/debian/control
index b0f632bea..b0f632bea 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/control
+++ b/debian/_base/applications/amarok.cmake/debian/control
diff --git a/debian/squeeze/applications/amarok.cmake/debian/copyright b/debian/_base/applications/amarok.cmake/debian/copyright
index 2775890ba..2775890ba 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/copyright
+++ b/debian/_base/applications/amarok.cmake/debian/copyright
diff --git a/debian/squeeze/applications/amarok.cmake/debian/icons/amarok-16.xpm b/debian/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm
index 80a228f20..80a228f20 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/icons/amarok-16.xpm
+++ b/debian/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm
diff --git a/debian/squeeze/applications/amarok.cmake/debian/icons/amarok.xpm b/debian/_base/applications/amarok.cmake/debian/icons/amarok.xpm
index 6411e36d0..6411e36d0 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/icons/amarok.xpm
+++ b/debian/_base/applications/amarok.cmake/debian/icons/amarok.xpm
diff --git a/debian/squeeze/applications/amarok.cmake/debian/install-mp3 b/debian/_base/applications/amarok.cmake/debian/install-mp3
index 7b06cbd2f..7b06cbd2f 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/install-mp3
+++ b/debian/_base/applications/amarok.cmake/debian/install-mp3
diff --git a/debian/squeeze/applications/amarok.cmake/debian/kubuntu-media-amarok b/debian/_base/applications/amarok.cmake/debian/kubuntu-media-amarok
index dacf7fc55..dacf7fc55 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/kubuntu-media-amarok
+++ b/debian/_base/applications/amarok.cmake/debian/kubuntu-media-amarok
diff --git a/debian/squeeze/applications/amarok.cmake/debian/man/amarok-trinity.1 b/debian/_base/applications/amarok.cmake/debian/man/amarok-trinity.1
index dac3bb8aa..dac3bb8aa 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/man/amarok-trinity.1
+++ b/debian/_base/applications/amarok.cmake/debian/man/amarok-trinity.1
diff --git a/debian/squeeze/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1 b/debian/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1
index c932b9b0c..c932b9b0c 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1
+++ b/debian/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1
diff --git a/debian/squeeze/applications/amarok.cmake/debian/man/amarokapp-trinity.1 b/debian/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1
index 0850440dd..0850440dd 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/man/amarokapp-trinity.1
+++ b/debian/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1
diff --git a/debian/squeeze/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1 b/debian/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1
index f4abfd1b2..f4abfd1b2 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1
+++ b/debian/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1
diff --git a/debian/squeeze/applications/amarok.cmake/debian/patches/series b/debian/_base/applications/amarok.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/patches/series
+++ b/debian/_base/applications/amarok.cmake/debian/patches/series
diff --git a/debian/squeeze/applications/amarok.cmake/debian/rules b/debian/_base/applications/amarok.cmake/debian/rules
index ae58dd49c..ae58dd49c 100755
--- a/debian/squeeze/applications/amarok.cmake/debian/rules
+++ b/debian/_base/applications/amarok.cmake/debian/rules
diff --git a/debian/squeeze/applications/amarok.cmake/debian/source/format b/debian/_base/applications/amarok.cmake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/source/format
+++ b/debian/_base/applications/amarok.cmake/debian/source/format
diff --git a/debian/squeeze/applications/amarok.cmake/debian/source/options b/debian/_base/applications/amarok.cmake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/source/options
+++ b/debian/_base/applications/amarok.cmake/debian/source/options
diff --git a/debian/squeeze/applications/amarok.cmake/debian/watch b/debian/_base/applications/amarok.cmake/debian/watch
index b0a7420bb..b0a7420bb 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/watch
+++ b/debian/_base/applications/amarok.cmake/debian/watch
diff --git a/debian/squeeze/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..ca324be99 100644
--- a/debian/squeeze/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/applications/amarok/debian/README.Debian b/debian/_base/applications/amarok/debian/README.Debian
index 7dc17fb17..7dc17fb17 100644
--- a/debian/squeeze/applications/amarok/debian/README.Debian
+++ b/debian/_base/applications/amarok/debian/README.Debian
diff --git a/debian/squeeze/applications/amarok/debian/amarok-common-trinity.install b/debian/_base/applications/amarok/debian/amarok-common-trinity.install
index 3b473baa0..3b473baa0 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-common-trinity.install
+++ b/debian/_base/applications/amarok/debian/amarok-common-trinity.install
diff --git a/debian/squeeze/applications/amarok/debian/amarok-engine-xine-trinity.install b/debian/_base/applications/amarok/debian/amarok-engine-xine-trinity.install
index c5e46604f..c5e46604f 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-engine-xine-trinity.install
+++ b/debian/_base/applications/amarok/debian/amarok-engine-xine-trinity.install
diff --git a/debian/squeeze/applications/amarok/debian/amarok-engine-yauap-trinity.install b/debian/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install
index ab71ca6f9..ab71ca6f9 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-engine-yauap-trinity.install
+++ b/debian/_base/applications/amarok/debian/amarok-engine-yauap-trinity.install
diff --git a/debian/squeeze/applications/amarok/debian/amarok-trinity.install b/debian/_base/applications/amarok/debian/amarok-trinity.install
index f5aeb567f..f5aeb567f 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-trinity.install
+++ b/debian/_base/applications/amarok/debian/amarok-trinity.install
diff --git a/debian/squeeze/applications/amarok/debian/amarok-trinity.manpages b/debian/_base/applications/amarok/debian/amarok-trinity.manpages
index 8094eebb9..8094eebb9 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-trinity.manpages
+++ b/debian/_base/applications/amarok/debian/amarok-trinity.manpages
diff --git a/debian/squeeze/applications/amarok/debian/amarok-trinity.menu b/debian/_base/applications/amarok/debian/amarok-trinity.menu
index f78ef6060..f78ef6060 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-trinity.menu
+++ b/debian/_base/applications/amarok/debian/amarok-trinity.menu
diff --git a/debian/squeeze/applications/amarok/debian/amarok_play_audiocd.desktop b/debian/_base/applications/amarok/debian/amarok_play_audiocd.desktop
index 434630b60..434630b60 100644
--- a/debian/squeeze/applications/amarok/debian/amarok_play_audiocd.desktop
+++ b/debian/_base/applications/amarok/debian/amarok_play_audiocd.desktop
diff --git a/debian/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/amarok/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/amarok/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/amarok/debian/cdbs/kde.mk b/debian/_base/applications/amarok/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/amarok/debian/cdbs/kde.mk
+++ b/debian/_base/applications/amarok/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/amarok/debian/cdbs/versions.pl b/debian/_base/applications/amarok/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/amarok/debian/cdbs/versions.pl
+++ b/debian/_base/applications/amarok/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/amarok/debian/changelog b/debian/_base/applications/amarok/debian/changelog
index 9551fe7f3..9551fe7f3 100644
--- a/debian/squeeze/applications/amarok/debian/changelog
+++ b/debian/_base/applications/amarok/debian/changelog
diff --git a/debian/squeeze/applications/amarok/debian/compat b/debian/_base/applications/amarok/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/amarok/debian/compat
+++ b/debian/_base/applications/amarok/debian/compat
diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/_base/applications/amarok/debian/control
index bbf0ffcc7..bbf0ffcc7 100644
--- a/debian/squeeze/applications/amarok/debian/control
+++ b/debian/_base/applications/amarok/debian/control
diff --git a/debian/squeeze/applications/amarok/debian/copyright b/debian/_base/applications/amarok/debian/copyright
index 2775890ba..2775890ba 100644
--- a/debian/squeeze/applications/amarok/debian/copyright
+++ b/debian/_base/applications/amarok/debian/copyright
diff --git a/debian/squeeze/applications/amarok/debian/icons/amarok-16.xpm b/debian/_base/applications/amarok/debian/icons/amarok-16.xpm
index 80a228f20..80a228f20 100644
--- a/debian/squeeze/applications/amarok/debian/icons/amarok-16.xpm
+++ b/debian/_base/applications/amarok/debian/icons/amarok-16.xpm
diff --git a/debian/squeeze/applications/amarok/debian/icons/amarok.xpm b/debian/_base/applications/amarok/debian/icons/amarok.xpm
index 6411e36d0..6411e36d0 100644
--- a/debian/squeeze/applications/amarok/debian/icons/amarok.xpm
+++ b/debian/_base/applications/amarok/debian/icons/amarok.xpm
diff --git a/debian/squeeze/applications/amarok/debian/install-mp3 b/debian/_base/applications/amarok/debian/install-mp3
index 7b06cbd2f..7b06cbd2f 100644
--- a/debian/squeeze/applications/amarok/debian/install-mp3
+++ b/debian/_base/applications/amarok/debian/install-mp3
diff --git a/debian/squeeze/applications/amarok/debian/kubuntu-media-amarok b/debian/_base/applications/amarok/debian/kubuntu-media-amarok
index dacf7fc55..dacf7fc55 100644
--- a/debian/squeeze/applications/amarok/debian/kubuntu-media-amarok
+++ b/debian/_base/applications/amarok/debian/kubuntu-media-amarok
diff --git a/debian/squeeze/applications/amarok/debian/man/amarok-trinity.1 b/debian/_base/applications/amarok/debian/man/amarok-trinity.1
index dac3bb8aa..dac3bb8aa 100644
--- a/debian/squeeze/applications/amarok/debian/man/amarok-trinity.1
+++ b/debian/_base/applications/amarok/debian/man/amarok-trinity.1
diff --git a/debian/squeeze/applications/amarok/debian/man/amarok_libvisual-trinity.1 b/debian/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1
index c932b9b0c..c932b9b0c 100644
--- a/debian/squeeze/applications/amarok/debian/man/amarok_libvisual-trinity.1
+++ b/debian/_base/applications/amarok/debian/man/amarok_libvisual-trinity.1
diff --git a/debian/squeeze/applications/amarok/debian/man/amarokapp-trinity.1 b/debian/_base/applications/amarok/debian/man/amarokapp-trinity.1
index 0850440dd..0850440dd 100644
--- a/debian/squeeze/applications/amarok/debian/man/amarokapp-trinity.1
+++ b/debian/_base/applications/amarok/debian/man/amarokapp-trinity.1
diff --git a/debian/squeeze/applications/amarok/debian/man/amarokcollectionscanner-trinity.1 b/debian/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
index f4abfd1b2..f4abfd1b2 100644
--- a/debian/squeeze/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
+++ b/debian/_base/applications/amarok/debian/man/amarokcollectionscanner-trinity.1
diff --git a/debian/squeeze/applications/amarok/debian/patches/series b/debian/_base/applications/amarok/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/amarok/debian/patches/series
+++ b/debian/_base/applications/amarok/debian/patches/series
diff --git a/debian/squeeze/applications/amarok/debian/rules b/debian/_base/applications/amarok/debian/rules
index bea194004..bea194004 100755
--- a/debian/squeeze/applications/amarok/debian/rules
+++ b/debian/_base/applications/amarok/debian/rules
diff --git a/debian/squeeze/applications/amarok/debian/source/format b/debian/_base/applications/amarok/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/amarok/debian/source/format
+++ b/debian/_base/applications/amarok/debian/source/format
diff --git a/debian/squeeze/applications/amarok/debian/source/options b/debian/_base/applications/amarok/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/amarok/debian/source/options
+++ b/debian/_base/applications/amarok/debian/source/options
diff --git a/debian/squeeze/applications/amarok/debian/watch b/debian/_base/applications/amarok/debian/watch
index b0a7420bb..b0a7420bb 100644
--- a/debian/squeeze/applications/amarok/debian/watch
+++ b/debian/_base/applications/amarok/debian/watch
diff --git a/debian/squeeze/applications/basket/debian/basket-kontact-integration-trinity.install b/debian/_base/applications/basket/debian/basket-kontact-integration-trinity.install
index 846f111d3..846f111d3 100644
--- a/debian/squeeze/applications/basket/debian/basket-kontact-integration-trinity.install
+++ b/debian/_base/applications/basket/debian/basket-kontact-integration-trinity.install
diff --git a/debian/squeeze/applications/basket/debian/basket-trinity.install b/debian/_base/applications/basket/debian/basket-trinity.install
index a24d7e924..a24d7e924 100644
--- a/debian/squeeze/applications/basket/debian/basket-trinity.install
+++ b/debian/_base/applications/basket/debian/basket-trinity.install
diff --git a/debian/squeeze/applications/basket/debian/basket.1 b/debian/_base/applications/basket/debian/basket.1
index 46f5a3754..46f5a3754 100644
--- a/debian/squeeze/applications/basket/debian/basket.1
+++ b/debian/_base/applications/basket/debian/basket.1
diff --git a/debian/squeeze/applications/basket/debian/changelog b/debian/_base/applications/basket/debian/changelog
index e39578cba..e39578cba 100644
--- a/debian/squeeze/applications/basket/debian/changelog
+++ b/debian/_base/applications/basket/debian/changelog
diff --git a/debian/squeeze/applications/basket/debian/compat b/debian/_base/applications/basket/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/basket/debian/compat
+++ b/debian/_base/applications/basket/debian/compat
diff --git a/debian/squeeze/applications/basket/debian/control b/debian/_base/applications/basket/debian/control
index 5f29d0e65..5f29d0e65 100644
--- a/debian/squeeze/applications/basket/debian/control
+++ b/debian/_base/applications/basket/debian/control
diff --git a/debian/squeeze/applications/basket/debian/copyright b/debian/_base/applications/basket/debian/copyright
index 32425ad0a..32425ad0a 100644
--- a/debian/squeeze/applications/basket/debian/copyright
+++ b/debian/_base/applications/basket/debian/copyright
diff --git a/debian/squeeze/applications/basket/debian/dirs b/debian/_base/applications/basket/debian/dirs
index f583045fe..f583045fe 100644
--- a/debian/squeeze/applications/basket/debian/dirs
+++ b/debian/_base/applications/basket/debian/dirs
diff --git a/debian/squeeze/applications/basket/debian/docs b/debian/_base/applications/basket/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/basket/debian/docs
+++ b/debian/_base/applications/basket/debian/docs
diff --git a/debian/squeeze/applications/basket/debian/menu b/debian/_base/applications/basket/debian/menu
index a7e14117e..a7e14117e 100644
--- a/debian/squeeze/applications/basket/debian/menu
+++ b/debian/_base/applications/basket/debian/menu
diff --git a/debian/squeeze/applications/basket/debian/patches/series b/debian/_base/applications/basket/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/basket/debian/patches/series
+++ b/debian/_base/applications/basket/debian/patches/series
diff --git a/debian/squeeze/applications/basket/debian/rules b/debian/_base/applications/basket/debian/rules
index 200c5baf7..200c5baf7 100755
--- a/debian/squeeze/applications/basket/debian/rules
+++ b/debian/_base/applications/basket/debian/rules
diff --git a/debian/squeeze/applications/basket/debian/source/format b/debian/_base/applications/basket/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/basket/debian/source/format
+++ b/debian/_base/applications/basket/debian/source/format
diff --git a/debian/squeeze/applications/basket/debian/source/options b/debian/_base/applications/basket/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/basket/debian/source/options
+++ b/debian/_base/applications/basket/debian/source/options
diff --git a/debian/squeeze/applications/basket/debian/watch b/debian/_base/applications/basket/debian/watch
index a620b0d5a..a620b0d5a 100644
--- a/debian/squeeze/applications/basket/debian/watch
+++ b/debian/_base/applications/basket/debian/watch
diff --git a/debian/squeeze/applications/bibletime/debian/bibletime.xpm b/debian/_base/applications/bibletime/debian/bibletime.xpm
index e782dea59..e782dea59 100644
--- a/debian/squeeze/applications/bibletime/debian/bibletime.xpm
+++ b/debian/_base/applications/bibletime/debian/bibletime.xpm
diff --git a/debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/bibletime/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk b/debian/_base/applications/bibletime/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk
+++ b/debian/_base/applications/bibletime/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/bibletime/debian/cdbs/versions.pl b/debian/_base/applications/bibletime/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/bibletime/debian/cdbs/versions.pl
+++ b/debian/_base/applications/bibletime/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/bibletime/debian/changelog b/debian/_base/applications/bibletime/debian/changelog
index 0592f7738..0592f7738 100644
--- a/debian/squeeze/applications/bibletime/debian/changelog
+++ b/debian/_base/applications/bibletime/debian/changelog
diff --git a/debian/squeeze/applications/bibletime/debian/compat b/debian/_base/applications/bibletime/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/bibletime/debian/compat
+++ b/debian/_base/applications/bibletime/debian/compat
diff --git a/debian/squeeze/applications/bibletime/debian/control b/debian/_base/applications/bibletime/debian/control
index 22a9c035c..22a9c035c 100644
--- a/debian/squeeze/applications/bibletime/debian/control
+++ b/debian/_base/applications/bibletime/debian/control
diff --git a/debian/squeeze/applications/bibletime/debian/copyright b/debian/_base/applications/bibletime/debian/copyright
index c256c741a..c256c741a 100644
--- a/debian/squeeze/applications/bibletime/debian/copyright
+++ b/debian/_base/applications/bibletime/debian/copyright
diff --git a/debian/squeeze/applications/bibletime/debian/de/bibletime.1 b/debian/_base/applications/bibletime/debian/de/bibletime.1
index 6b662b132..6b662b132 100644
--- a/debian/squeeze/applications/bibletime/debian/de/bibletime.1
+++ b/debian/_base/applications/bibletime/debian/de/bibletime.1
diff --git a/debian/squeeze/applications/bibletime/debian/dirs b/debian/_base/applications/bibletime/debian/dirs
index b870fa9c8..b870fa9c8 100644
--- a/debian/squeeze/applications/bibletime/debian/dirs
+++ b/debian/_base/applications/bibletime/debian/dirs
diff --git a/debian/squeeze/applications/bibletime/debian/en/bibletime.1 b/debian/_base/applications/bibletime/debian/en/bibletime.1
index b71192301..b71192301 100644
--- a/debian/squeeze/applications/bibletime/debian/en/bibletime.1
+++ b/debian/_base/applications/bibletime/debian/en/bibletime.1
diff --git a/debian/squeeze/applications/bibletime/debian/install b/debian/_base/applications/bibletime/debian/install
index dc727ccec..dc727ccec 100644
--- a/debian/squeeze/applications/bibletime/debian/install
+++ b/debian/_base/applications/bibletime/debian/install
diff --git a/debian/squeeze/applications/bibletime/debian/menu b/debian/_base/applications/bibletime/debian/menu
index 7ba4e395f..7ba4e395f 100644
--- a/debian/squeeze/applications/bibletime/debian/menu
+++ b/debian/_base/applications/bibletime/debian/menu
diff --git a/debian/squeeze/applications/bibletime/debian/patches/series b/debian/_base/applications/bibletime/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/bibletime/debian/patches/series
+++ b/debian/_base/applications/bibletime/debian/patches/series
diff --git a/debian/squeeze/applications/bibletime/debian/rules b/debian/_base/applications/bibletime/debian/rules
index c57001178..c57001178 100755
--- a/debian/squeeze/applications/bibletime/debian/rules
+++ b/debian/_base/applications/bibletime/debian/rules
diff --git a/debian/squeeze/applications/bibletime/debian/source/format b/debian/_base/applications/bibletime/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/bibletime/debian/source/format
+++ b/debian/_base/applications/bibletime/debian/source/format
diff --git a/debian/squeeze/applications/bibletime/debian/source/options b/debian/_base/applications/bibletime/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/bibletime/debian/source/options
+++ b/debian/_base/applications/bibletime/debian/source/options
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl b/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog b/debian/_base/applications/compizconfig-backend-kconfig/debian/changelog
index d234636a4..d234636a4 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/changelog
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/changelog
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/compat b/debian/_base/applications/compizconfig-backend-kconfig/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/compat
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/compat
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control b/debian/_base/applications/compizconfig-backend-kconfig/debian/control
index f3914231e..f3914231e 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/control
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/control
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/copyright b/debian/_base/applications/compizconfig-backend-kconfig/debian/copyright
index 68f70d9c0..68f70d9c0 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/copyright
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/copyright
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/series b/debian/_base/applications/compizconfig-backend-kconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/patches/series
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/patches/series
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules b/debian/_base/applications/compizconfig-backend-kconfig/debian/rules
index cbb918dcb..cbb918dcb 100755
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/rules
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/source/format b/debian/_base/applications/compizconfig-backend-kconfig/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/source/format
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/source/format
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/source/options b/debian/_base/applications/compizconfig-backend-kconfig/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/source/options
+++ b/debian/_base/applications/compizconfig-backend-kconfig/debian/source/options
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/changelog b/debian/_base/applications/desktop-effects-kde/debian/changelog
index 4f20cbb6a..4f20cbb6a 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/changelog
+++ b/debian/_base/applications/desktop-effects-kde/debian/changelog
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/compat b/debian/_base/applications/desktop-effects-kde/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/compat
+++ b/debian/_base/applications/desktop-effects-kde/debian/compat
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/control b/debian/_base/applications/desktop-effects-kde/debian/control
index 51dafb9e5..51dafb9e5 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/control
+++ b/debian/_base/applications/desktop-effects-kde/debian/control
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/copyright b/debian/_base/applications/desktop-effects-kde/debian/copyright
index b2569f52f..b2569f52f 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/copyright
+++ b/debian/_base/applications/desktop-effects-kde/debian/copyright
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install b/debian/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
index e6d16e467..e6d16e467 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
+++ b/debian/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/rules b/debian/_base/applications/desktop-effects-kde/debian/rules
index 25fa64a44..25fa64a44 100755
--- a/debian/squeeze/applications/desktop-effects-kde/debian/rules
+++ b/debian/_base/applications/desktop-effects-kde/debian/rules
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/source/format b/debian/_base/applications/desktop-effects-kde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/source/format
+++ b/debian/_base/applications/desktop-effects-kde/debian/source/format
diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/source/options b/debian/_base/applications/desktop-effects-kde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/desktop-effects-kde/debian/source/options
+++ b/debian/_base/applications/desktop-effects-kde/debian/source/options
diff --git a/debian/squeeze/applications/digikam/debian/NEWS b/debian/_base/applications/digikam/debian/NEWS
index a90a3b444..a90a3b444 100644
--- a/debian/squeeze/applications/digikam/debian/NEWS
+++ b/debian/_base/applications/digikam/debian/NEWS
diff --git a/debian/squeeze/applications/digikam/debian/README.Debian b/debian/_base/applications/digikam/debian/README.Debian
index 351a34b1f..351a34b1f 100644
--- a/debian/squeeze/applications/digikam/debian/README.Debian
+++ b/debian/_base/applications/digikam/debian/README.Debian
diff --git a/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/digikam/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/digikam/debian/cdbs/kde.mk b/debian/_base/applications/digikam/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/digikam/debian/cdbs/kde.mk
+++ b/debian/_base/applications/digikam/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/digikam/debian/cdbs/versions.pl b/debian/_base/applications/digikam/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/digikam/debian/cdbs/versions.pl
+++ b/debian/_base/applications/digikam/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/digikam/debian/changelog b/debian/_base/applications/digikam/debian/changelog
index 42c8bae54..42c8bae54 100644
--- a/debian/squeeze/applications/digikam/debian/changelog
+++ b/debian/_base/applications/digikam/debian/changelog
diff --git a/debian/squeeze/applications/digikam/debian/clean b/debian/_base/applications/digikam/debian/clean
index d0ada902a..d0ada902a 100644
--- a/debian/squeeze/applications/digikam/debian/clean
+++ b/debian/_base/applications/digikam/debian/clean
diff --git a/debian/squeeze/applications/digikam/debian/compat b/debian/_base/applications/digikam/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/digikam/debian/compat
+++ b/debian/_base/applications/digikam/debian/compat
diff --git a/debian/squeeze/applications/digikam/debian/control b/debian/_base/applications/digikam/debian/control
index 5c190400f..5c190400f 100644
--- a/debian/squeeze/applications/digikam/debian/control
+++ b/debian/_base/applications/digikam/debian/control
diff --git a/debian/squeeze/applications/digikam/debian/copyright b/debian/_base/applications/digikam/debian/copyright
index c4c44e441..c4c44e441 100644
--- a/debian/squeeze/applications/digikam/debian/copyright
+++ b/debian/_base/applications/digikam/debian/copyright
diff --git a/debian/squeeze/applications/digikam/debian/digikam-trinity.install b/debian/_base/applications/digikam/debian/digikam-trinity.install
index 87c7fe33f..87c7fe33f 100644
--- a/debian/squeeze/applications/digikam/debian/digikam-trinity.install
+++ b/debian/_base/applications/digikam/debian/digikam-trinity.install
diff --git a/debian/squeeze/applications/digikam/debian/digikam-trinity.lintian-overrides b/debian/_base/applications/digikam/debian/digikam-trinity.lintian-overrides
index 59b14fa47..59b14fa47 100644
--- a/debian/squeeze/applications/digikam/debian/digikam-trinity.lintian-overrides
+++ b/debian/_base/applications/digikam/debian/digikam-trinity.lintian-overrides
diff --git a/debian/squeeze/applications/digikam/debian/digikam-trinity.manpages b/debian/_base/applications/digikam/debian/digikam-trinity.manpages
index 4e21f2805..4e21f2805 100644
--- a/debian/squeeze/applications/digikam/debian/digikam-trinity.manpages
+++ b/debian/_base/applications/digikam/debian/digikam-trinity.manpages
diff --git a/debian/squeeze/applications/digikam/debian/digikam-trinity.menu b/debian/_base/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..949e0fba8 100644
--- a/debian/squeeze/applications/digikam/debian/digikam-trinity.menu
+++ b/debian/_base/applications/digikam/debian/digikam-trinity.menu
diff --git a/debian/squeeze/applications/digikam/debian/digikam.manpage b/debian/_base/applications/digikam/debian/digikam.manpage
index ed8c640c1..ed8c640c1 100644
--- a/debian/squeeze/applications/digikam/debian/digikam.manpage
+++ b/debian/_base/applications/digikam/debian/digikam.manpage
diff --git a/debian/squeeze/applications/digikam/debian/patches/series b/debian/_base/applications/digikam/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/digikam/debian/patches/series
+++ b/debian/_base/applications/digikam/debian/patches/series
diff --git a/debian/squeeze/applications/digikam/debian/rules b/debian/_base/applications/digikam/debian/rules
index 2d85649a6..2d85649a6 100755
--- a/debian/squeeze/applications/digikam/debian/rules
+++ b/debian/_base/applications/digikam/debian/rules
diff --git a/debian/squeeze/applications/digikam/debian/showfoto-trinity.install b/debian/_base/applications/digikam/debian/showfoto-trinity.install
index d9ff5c47a..d9ff5c47a 100644
--- a/debian/squeeze/applications/digikam/debian/showfoto-trinity.install
+++ b/debian/_base/applications/digikam/debian/showfoto-trinity.install
diff --git a/debian/squeeze/applications/digikam/debian/showfoto-trinity.manpage b/debian/_base/applications/digikam/debian/showfoto-trinity.manpage
index 2c5a6ad20..2c5a6ad20 100644
--- a/debian/squeeze/applications/digikam/debian/showfoto-trinity.manpage
+++ b/debian/_base/applications/digikam/debian/showfoto-trinity.manpage
diff --git a/debian/squeeze/applications/digikam/debian/showfoto-trinity.manpages b/debian/_base/applications/digikam/debian/showfoto-trinity.manpages
index e146c959f..e146c959f 100644
--- a/debian/squeeze/applications/digikam/debian/showfoto-trinity.manpages
+++ b/debian/_base/applications/digikam/debian/showfoto-trinity.manpages
diff --git a/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu b/debian/_base/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..32ce26612 100644
--- a/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu
+++ b/debian/_base/applications/digikam/debian/showfoto-trinity.menu
diff --git a/debian/squeeze/applications/digikam/debian/source/format b/debian/_base/applications/digikam/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/digikam/debian/source/format
+++ b/debian/_base/applications/digikam/debian/source/format
diff --git a/debian/squeeze/applications/digikam/debian/source/options b/debian/_base/applications/digikam/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/digikam/debian/source/options
+++ b/debian/_base/applications/digikam/debian/source/options
diff --git a/debian/squeeze/applications/digikam/debian/watch b/debian/_base/applications/digikam/debian/watch
index 16e6d05c4..16e6d05c4 100644
--- a/debian/squeeze/applications/digikam/debian/watch
+++ b/debian/_base/applications/digikam/debian/watch
diff --git a/debian/squeeze/applications/digikam/debian/xpm.d/digikam-16.xpm b/debian/_base/applications/digikam/debian/xpm.d/digikam-16.xpm
index 5820677d7..5820677d7 100644
--- a/debian/squeeze/applications/digikam/debian/xpm.d/digikam-16.xpm
+++ b/debian/_base/applications/digikam/debian/xpm.d/digikam-16.xpm
diff --git a/debian/squeeze/applications/digikam/debian/xpm.d/digikam.xpm b/debian/_base/applications/digikam/debian/xpm.d/digikam.xpm
index 88a2f7df2..88a2f7df2 100644
--- a/debian/squeeze/applications/digikam/debian/xpm.d/digikam.xpm
+++ b/debian/_base/applications/digikam/debian/xpm.d/digikam.xpm
diff --git a/debian/squeeze/applications/digikam/debian/xpm.d/showfoto-16.xpm b/debian/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm
index 7425c5ba7..7425c5ba7 100644
--- a/debian/squeeze/applications/digikam/debian/xpm.d/showfoto-16.xpm
+++ b/debian/_base/applications/digikam/debian/xpm.d/showfoto-16.xpm
diff --git a/debian/squeeze/applications/digikam/debian/xpm.d/showfoto.xpm b/debian/_base/applications/digikam/debian/xpm.d/showfoto.xpm
index ef7ea08fa..ef7ea08fa 100644
--- a/debian/squeeze/applications/digikam/debian/xpm.d/showfoto.xpm
+++ b/debian/_base/applications/digikam/debian/xpm.d/showfoto.xpm
diff --git a/debian/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index 2dff59226..2dff59226 100644
--- a/debian/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/dolphin/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/dolphin/debian/cdbs/kde.mk b/debian/_base/applications/dolphin/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/dolphin/debian/cdbs/kde.mk
+++ b/debian/_base/applications/dolphin/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/dolphin/debian/cdbs/versions.pl b/debian/_base/applications/dolphin/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/dolphin/debian/cdbs/versions.pl
+++ b/debian/_base/applications/dolphin/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/dolphin/debian/changelog b/debian/_base/applications/dolphin/debian/changelog
index 5a0a63c7d..5a0a63c7d 100644
--- a/debian/squeeze/applications/dolphin/debian/changelog
+++ b/debian/_base/applications/dolphin/debian/changelog
diff --git a/debian/squeeze/applications/dolphin/debian/compat b/debian/_base/applications/dolphin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/dolphin/debian/compat
+++ b/debian/_base/applications/dolphin/debian/compat
diff --git a/debian/squeeze/applications/dolphin/debian/control b/debian/_base/applications/dolphin/debian/control
index 865595c90..865595c90 100644
--- a/debian/squeeze/applications/dolphin/debian/control
+++ b/debian/_base/applications/dolphin/debian/control
diff --git a/debian/squeeze/applications/dolphin/debian/copyright b/debian/_base/applications/dolphin/debian/copyright
index 970a6b5a2..970a6b5a2 100644
--- a/debian/squeeze/applications/dolphin/debian/copyright
+++ b/debian/_base/applications/dolphin/debian/copyright
diff --git a/debian/squeeze/applications/dolphin/debian/dolphin.1 b/debian/_base/applications/dolphin/debian/dolphin.1
index 2a1a972f0..2a1a972f0 100644
--- a/debian/squeeze/applications/dolphin/debian/dolphin.1
+++ b/debian/_base/applications/dolphin/debian/dolphin.1
diff --git a/debian/squeeze/applications/dolphin/debian/manpages b/debian/_base/applications/dolphin/debian/manpages
index 8b02277f2..8b02277f2 100644
--- a/debian/squeeze/applications/dolphin/debian/manpages
+++ b/debian/_base/applications/dolphin/debian/manpages
diff --git a/debian/squeeze/applications/dolphin/debian/patches/series b/debian/_base/applications/dolphin/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/dolphin/debian/patches/series
+++ b/debian/_base/applications/dolphin/debian/patches/series
diff --git a/debian/squeeze/applications/dolphin/debian/rules b/debian/_base/applications/dolphin/debian/rules
index 7b4528041..7b4528041 100755
--- a/debian/squeeze/applications/dolphin/debian/rules
+++ b/debian/_base/applications/dolphin/debian/rules
diff --git a/debian/squeeze/applications/dolphin/debian/source/format b/debian/_base/applications/dolphin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/dolphin/debian/source/format
+++ b/debian/_base/applications/dolphin/debian/source/format
diff --git a/debian/squeeze/applications/dolphin/debian/source/options b/debian/_base/applications/dolphin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/dolphin/debian/source/options
+++ b/debian/_base/applications/dolphin/debian/source/options
diff --git a/debian/squeeze/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk b/debian/_base/applications/filelight-l10n/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk
+++ b/debian/_base/applications/filelight-l10n/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/filelight-l10n/debian/cdbs/versions.pl b/debian/_base/applications/filelight-l10n/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/debian/_base/applications/filelight-l10n/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/filelight-l10n/debian/changelog b/debian/_base/applications/filelight-l10n/debian/changelog
index 1c4c5eee8..1c4c5eee8 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/changelog
+++ b/debian/_base/applications/filelight-l10n/debian/changelog
diff --git a/debian/squeeze/applications/filelight-l10n/debian/compat b/debian/_base/applications/filelight-l10n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/compat
+++ b/debian/_base/applications/filelight-l10n/debian/compat
diff --git a/debian/squeeze/applications/filelight-l10n/debian/control b/debian/_base/applications/filelight-l10n/debian/control
index 3f71dd7a3..3f71dd7a3 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/control
+++ b/debian/_base/applications/filelight-l10n/debian/control
diff --git a/debian/squeeze/applications/filelight-l10n/debian/copyright b/debian/_base/applications/filelight-l10n/debian/copyright
index f840087a2..f840087a2 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/copyright
+++ b/debian/_base/applications/filelight-l10n/debian/copyright
diff --git a/debian/squeeze/applications/filelight-l10n/debian/patches/series b/debian/_base/applications/filelight-l10n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/patches/series
+++ b/debian/_base/applications/filelight-l10n/debian/patches/series
diff --git a/debian/squeeze/applications/filelight-l10n/debian/rules b/debian/_base/applications/filelight-l10n/debian/rules
index 5d3cc2a77..5d3cc2a77 100755
--- a/debian/squeeze/applications/filelight-l10n/debian/rules
+++ b/debian/_base/applications/filelight-l10n/debian/rules
diff --git a/debian/squeeze/applications/filelight-l10n/debian/source/format b/debian/_base/applications/filelight-l10n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/source/format
+++ b/debian/_base/applications/filelight-l10n/debian/source/format
diff --git a/debian/squeeze/applications/filelight-l10n/debian/source/options b/debian/_base/applications/filelight-l10n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/source/options
+++ b/debian/_base/applications/filelight-l10n/debian/source/options
diff --git a/debian/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/filelight/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/filelight/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/filelight/debian/cdbs/kde.mk b/debian/_base/applications/filelight/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/filelight/debian/cdbs/kde.mk
+++ b/debian/_base/applications/filelight/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/filelight/debian/cdbs/versions.pl b/debian/_base/applications/filelight/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/filelight/debian/cdbs/versions.pl
+++ b/debian/_base/applications/filelight/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/filelight/debian/changelog b/debian/_base/applications/filelight/debian/changelog
index d59a45c8e..d59a45c8e 100644
--- a/debian/squeeze/applications/filelight/debian/changelog
+++ b/debian/_base/applications/filelight/debian/changelog
diff --git a/debian/squeeze/applications/filelight/debian/compat b/debian/_base/applications/filelight/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/filelight/debian/compat
+++ b/debian/_base/applications/filelight/debian/compat
diff --git a/debian/squeeze/applications/filelight/debian/control b/debian/_base/applications/filelight/debian/control
index 1d39d2fe9..1d39d2fe9 100644
--- a/debian/squeeze/applications/filelight/debian/control
+++ b/debian/_base/applications/filelight/debian/control
diff --git a/debian/squeeze/applications/filelight/debian/copyright b/debian/_base/applications/filelight/debian/copyright
index c02dc5949..c02dc5949 100644
--- a/debian/squeeze/applications/filelight/debian/copyright
+++ b/debian/_base/applications/filelight/debian/copyright
diff --git a/debian/squeeze/applications/filelight/debian/filelight.1 b/debian/_base/applications/filelight/debian/filelight.1
index ce932984b..ce932984b 100644
--- a/debian/squeeze/applications/filelight/debian/filelight.1
+++ b/debian/_base/applications/filelight/debian/filelight.1
diff --git a/debian/squeeze/applications/filelight/debian/menu b/debian/_base/applications/filelight/debian/menu
index 4db4c3f62..4db4c3f62 100644
--- a/debian/squeeze/applications/filelight/debian/menu
+++ b/debian/_base/applications/filelight/debian/menu
diff --git a/debian/squeeze/applications/filelight/debian/patches/series b/debian/_base/applications/filelight/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/filelight/debian/patches/series
+++ b/debian/_base/applications/filelight/debian/patches/series
diff --git a/debian/squeeze/applications/filelight/debian/rules b/debian/_base/applications/filelight/debian/rules
index 213a5bf3d..213a5bf3d 100755
--- a/debian/squeeze/applications/filelight/debian/rules
+++ b/debian/_base/applications/filelight/debian/rules
diff --git a/debian/squeeze/applications/filelight/debian/source/format b/debian/_base/applications/filelight/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/filelight/debian/source/format
+++ b/debian/_base/applications/filelight/debian/source/format
diff --git a/debian/squeeze/applications/filelight/debian/source/options b/debian/_base/applications/filelight/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/filelight/debian/source/options
+++ b/debian/_base/applications/filelight/debian/source/options
diff --git a/debian/squeeze/applications/fusion-icon/debian/changelog b/debian/_base/applications/fusion-icon/debian/changelog
index 87f2b117a..87f2b117a 100644
--- a/debian/squeeze/applications/fusion-icon/debian/changelog
+++ b/debian/_base/applications/fusion-icon/debian/changelog
diff --git a/debian/squeeze/applications/fusion-icon/debian/compat b/debian/_base/applications/fusion-icon/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/fusion-icon/debian/compat
+++ b/debian/_base/applications/fusion-icon/debian/compat
diff --git a/debian/squeeze/applications/fusion-icon/debian/control b/debian/_base/applications/fusion-icon/debian/control
index 247483d23..247483d23 100644
--- a/debian/squeeze/applications/fusion-icon/debian/control
+++ b/debian/_base/applications/fusion-icon/debian/control
diff --git a/debian/squeeze/applications/fusion-icon/debian/copyright b/debian/_base/applications/fusion-icon/debian/copyright
index ae1ce34fa..ae1ce34fa 100644
--- a/debian/squeeze/applications/fusion-icon/debian/copyright
+++ b/debian/_base/applications/fusion-icon/debian/copyright
diff --git a/debian/squeeze/applications/fusion-icon/debian/fusion-icon.1 b/debian/_base/applications/fusion-icon/debian/fusion-icon.1
index 1b15860e1..1b15860e1 100644
--- a/debian/squeeze/applications/fusion-icon/debian/fusion-icon.1
+++ b/debian/_base/applications/fusion-icon/debian/fusion-icon.1
diff --git a/debian/squeeze/applications/fusion-icon/debian/fusion-icon.xpm b/debian/_base/applications/fusion-icon/debian/fusion-icon.xpm
index fe0843739..fe0843739 100644
--- a/debian/squeeze/applications/fusion-icon/debian/fusion-icon.xpm
+++ b/debian/_base/applications/fusion-icon/debian/fusion-icon.xpm
diff --git a/debian/squeeze/applications/fusion-icon/debian/install b/debian/_base/applications/fusion-icon/debian/install
index 7d4e26567..7d4e26567 100644
--- a/debian/squeeze/applications/fusion-icon/debian/install
+++ b/debian/_base/applications/fusion-icon/debian/install
diff --git a/debian/squeeze/applications/fusion-icon/debian/links b/debian/_base/applications/fusion-icon/debian/links
index 51627e83a..51627e83a 100644
--- a/debian/squeeze/applications/fusion-icon/debian/links
+++ b/debian/_base/applications/fusion-icon/debian/links
diff --git a/debian/squeeze/applications/fusion-icon/debian/manpages b/debian/_base/applications/fusion-icon/debian/manpages
index 3ba122a39..3ba122a39 100644
--- a/debian/squeeze/applications/fusion-icon/debian/manpages
+++ b/debian/_base/applications/fusion-icon/debian/manpages
diff --git a/debian/squeeze/applications/fusion-icon/debian/menu b/debian/_base/applications/fusion-icon/debian/menu
index e85a21dbf..e85a21dbf 100644
--- a/debian/squeeze/applications/fusion-icon/debian/menu
+++ b/debian/_base/applications/fusion-icon/debian/menu
diff --git a/debian/squeeze/applications/fusion-icon/debian/patches/series b/debian/_base/applications/fusion-icon/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/fusion-icon/debian/patches/series
+++ b/debian/_base/applications/fusion-icon/debian/patches/series
diff --git a/debian/squeeze/applications/fusion-icon/debian/pycompat b/debian/_base/applications/fusion-icon/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/debian/squeeze/applications/fusion-icon/debian/pycompat
+++ b/debian/_base/applications/fusion-icon/debian/pycompat
diff --git a/debian/squeeze/applications/fusion-icon/debian/python-distutils-custom.mk b/debian/_base/applications/fusion-icon/debian/python-distutils-custom.mk
index fbc70a624..fbc70a624 100644
--- a/debian/squeeze/applications/fusion-icon/debian/python-distutils-custom.mk
+++ b/debian/_base/applications/fusion-icon/debian/python-distutils-custom.mk
diff --git a/debian/squeeze/applications/fusion-icon/debian/rules b/debian/_base/applications/fusion-icon/debian/rules
index 88040a563..88040a563 100755
--- a/debian/squeeze/applications/fusion-icon/debian/rules
+++ b/debian/_base/applications/fusion-icon/debian/rules
diff --git a/debian/squeeze/applications/fusion-icon/debian/source/format b/debian/_base/applications/fusion-icon/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/fusion-icon/debian/source/format
+++ b/debian/_base/applications/fusion-icon/debian/source/format
diff --git a/debian/squeeze/applications/fusion-icon/debian/source/options b/debian/_base/applications/fusion-icon/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/fusion-icon/debian/source/options
+++ b/debian/_base/applications/fusion-icon/debian/source/options
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
index a34c9c81c..a34c9c81c 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
+++ b/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
index 874f83934..874f83934 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
+++ b/debian/_base/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-qt-kde.mk
index 65f5f6f95..65f5f6f95 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk b/debian/_base/applications/gtk-qt-engine/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk
+++ b/debian/_base/applications/gtk-qt-engine/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/versions.pl b/debian/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/versions.pl
+++ b/debian/_base/applications/gtk-qt-engine/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/changelog b/debian/_base/applications/gtk-qt-engine/debian/changelog
index cf3d30a9a..cf3d30a9a 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/changelog
+++ b/debian/_base/applications/gtk-qt-engine/debian/changelog
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/compat b/debian/_base/applications/gtk-qt-engine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/compat
+++ b/debian/_base/applications/gtk-qt-engine/debian/compat
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/control b/debian/_base/applications/gtk-qt-engine/debian/control
index 730aabc0f..730aabc0f 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/control
+++ b/debian/_base/applications/gtk-qt-engine/debian/control
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/copyright b/debian/_base/applications/gtk-qt-engine/debian/copyright
index aa4e449ee..aa4e449ee 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/copyright
+++ b/debian/_base/applications/gtk-qt-engine/debian/copyright
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
index 5502ed8f4..5502ed8f4 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
+++ b/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
index b477f5ce2..b477f5ce2 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
+++ b/debian/_base/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/patches/series b/debian/_base/applications/gtk-qt-engine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/patches/series
+++ b/debian/_base/applications/gtk-qt-engine/debian/patches/series
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/rules b/debian/_base/applications/gtk-qt-engine/debian/rules
index 4e6f9181d..4e6f9181d 100755
--- a/debian/squeeze/applications/gtk-qt-engine/debian/rules
+++ b/debian/_base/applications/gtk-qt-engine/debian/rules
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/source/format b/debian/_base/applications/gtk-qt-engine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/source/format
+++ b/debian/_base/applications/gtk-qt-engine/debian/source/format
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/source/options b/debian/_base/applications/gtk-qt-engine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/source/options
+++ b/debian/_base/applications/gtk-qt-engine/debian/source/options
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
index 3bd77b8f7..3bd77b8f7 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/kde.mk b/debian/_base/applications/gwenview-i18n/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/kde.mk
+++ b/debian/_base/applications/gwenview-i18n/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/versions.pl b/debian/_base/applications/gwenview-i18n/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/versions.pl
+++ b/debian/_base/applications/gwenview-i18n/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/changelog b/debian/_base/applications/gwenview-i18n/debian/changelog
index 035a06d71..035a06d71 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/changelog
+++ b/debian/_base/applications/gwenview-i18n/debian/changelog
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/compat b/debian/_base/applications/gwenview-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/compat
+++ b/debian/_base/applications/gwenview-i18n/debian/compat
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/control b/debian/_base/applications/gwenview-i18n/debian/control
index c7bc196b8..c7bc196b8 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/control
+++ b/debian/_base/applications/gwenview-i18n/debian/control
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/copyright b/debian/_base/applications/gwenview-i18n/debian/copyright
index b0709da94..b0709da94 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/copyright
+++ b/debian/_base/applications/gwenview-i18n/debian/copyright
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/debiandirs b/debian/_base/applications/gwenview-i18n/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/debiandirs
+++ b/debian/_base/applications/gwenview-i18n/debian/debiandirs
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/patches/series b/debian/_base/applications/gwenview-i18n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/patches/series
+++ b/debian/_base/applications/gwenview-i18n/debian/patches/series
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/rules b/debian/_base/applications/gwenview-i18n/debian/rules
index 05b674469..05b674469 100755
--- a/debian/squeeze/applications/gwenview-i18n/debian/rules
+++ b/debian/_base/applications/gwenview-i18n/debian/rules
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/source/format b/debian/_base/applications/gwenview-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/source/format
+++ b/debian/_base/applications/gwenview-i18n/debian/source/format
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/source/options b/debian/_base/applications/gwenview-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/source/options
+++ b/debian/_base/applications/gwenview-i18n/debian/source/options
diff --git a/debian/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/gwenview/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk b/debian/_base/applications/gwenview/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk
+++ b/debian/_base/applications/gwenview/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/gwenview/debian/cdbs/versions.pl b/debian/_base/applications/gwenview/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/gwenview/debian/cdbs/versions.pl
+++ b/debian/_base/applications/gwenview/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/gwenview/debian/changelog b/debian/_base/applications/gwenview/debian/changelog
index 2c29a5ee5..2c29a5ee5 100644
--- a/debian/squeeze/applications/gwenview/debian/changelog
+++ b/debian/_base/applications/gwenview/debian/changelog
diff --git a/debian/squeeze/applications/gwenview/debian/compat b/debian/_base/applications/gwenview/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/gwenview/debian/compat
+++ b/debian/_base/applications/gwenview/debian/compat
diff --git a/debian/squeeze/applications/gwenview/debian/control b/debian/_base/applications/gwenview/debian/control
index bd7b237fb..bd7b237fb 100644
--- a/debian/squeeze/applications/gwenview/debian/control
+++ b/debian/_base/applications/gwenview/debian/control
diff --git a/debian/squeeze/applications/gwenview/debian/copyright b/debian/_base/applications/gwenview/debian/copyright
index d87dc89ff..d87dc89ff 100644
--- a/debian/squeeze/applications/gwenview/debian/copyright
+++ b/debian/_base/applications/gwenview/debian/copyright
diff --git a/debian/squeeze/applications/gwenview/debian/gwenview.doc-base b/debian/_base/applications/gwenview/debian/gwenview.doc-base
index 9efaff358..9efaff358 100644
--- a/debian/squeeze/applications/gwenview/debian/gwenview.doc-base
+++ b/debian/_base/applications/gwenview/debian/gwenview.doc-base
diff --git a/debian/squeeze/applications/gwenview/debian/gwenview.lintian b/debian/_base/applications/gwenview/debian/gwenview.lintian
index e8c71a351..e8c71a351 100644
--- a/debian/squeeze/applications/gwenview/debian/gwenview.lintian
+++ b/debian/_base/applications/gwenview/debian/gwenview.lintian
diff --git a/debian/squeeze/applications/gwenview/debian/gwenview.xpm b/debian/_base/applications/gwenview/debian/gwenview.xpm
index 076efa834..076efa834 100644
--- a/debian/squeeze/applications/gwenview/debian/gwenview.xpm
+++ b/debian/_base/applications/gwenview/debian/gwenview.xpm
diff --git a/debian/squeeze/applications/gwenview/debian/menu b/debian/_base/applications/gwenview/debian/menu
index c20d8c34c..c20d8c34c 100644
--- a/debian/squeeze/applications/gwenview/debian/menu
+++ b/debian/_base/applications/gwenview/debian/menu
diff --git a/debian/squeeze/applications/gwenview/debian/patches/series b/debian/_base/applications/gwenview/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/gwenview/debian/patches/series
+++ b/debian/_base/applications/gwenview/debian/patches/series
diff --git a/debian/squeeze/applications/gwenview/debian/rules b/debian/_base/applications/gwenview/debian/rules
index 11548ae60..11548ae60 100755
--- a/debian/squeeze/applications/gwenview/debian/rules
+++ b/debian/_base/applications/gwenview/debian/rules
diff --git a/debian/squeeze/applications/gwenview/debian/source/format b/debian/_base/applications/gwenview/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/gwenview/debian/source/format
+++ b/debian/_base/applications/gwenview/debian/source/format
diff --git a/debian/squeeze/applications/gwenview/debian/source/options b/debian/_base/applications/gwenview/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/gwenview/debian/source/options
+++ b/debian/_base/applications/gwenview/debian/source/options
diff --git a/debian/squeeze/applications/k3b-i18n/debian/changelog b/debian/_base/applications/k3b-i18n/debian/changelog
index 3d2a61f28..3d2a61f28 100644
--- a/debian/squeeze/applications/k3b-i18n/debian/changelog
+++ b/debian/_base/applications/k3b-i18n/debian/changelog
diff --git a/debian/squeeze/applications/k3b-i18n/debian/compat b/debian/_base/applications/k3b-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/k3b-i18n/debian/compat
+++ b/debian/_base/applications/k3b-i18n/debian/compat
diff --git a/debian/squeeze/applications/k3b-i18n/debian/control b/debian/_base/applications/k3b-i18n/debian/control
index 8c2643680..8c2643680 100644
--- a/debian/squeeze/applications/k3b-i18n/debian/control
+++ b/debian/_base/applications/k3b-i18n/debian/control
diff --git a/debian/squeeze/applications/k3b-i18n/debian/copyright b/debian/_base/applications/k3b-i18n/debian/copyright
index c4a57636b..c4a57636b 100644
--- a/debian/squeeze/applications/k3b-i18n/debian/copyright
+++ b/debian/_base/applications/k3b-i18n/debian/copyright
diff --git a/debian/squeeze/applications/k3b-i18n/debian/rules b/debian/_base/applications/k3b-i18n/debian/rules
index c1a9a4afc..c1a9a4afc 100755
--- a/debian/squeeze/applications/k3b-i18n/debian/rules
+++ b/debian/_base/applications/k3b-i18n/debian/rules
diff --git a/debian/squeeze/applications/k3b-i18n/debian/source/format b/debian/_base/applications/k3b-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/k3b-i18n/debian/source/format
+++ b/debian/_base/applications/k3b-i18n/debian/source/format
diff --git a/debian/squeeze/applications/k3b-i18n/debian/source/options b/debian/_base/applications/k3b-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/k3b-i18n/debian/source/options
+++ b/debian/_base/applications/k3b-i18n/debian/source/options
diff --git a/debian/squeeze/applications/k3b-i18n/debian/watch b/debian/_base/applications/k3b-i18n/debian/watch
index cdaaf355a..cdaaf355a 100644
--- a/debian/squeeze/applications/k3b-i18n/debian/watch
+++ b/debian/_base/applications/k3b-i18n/debian/watch
diff --git a/debian/squeeze/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 0cf0bd0a6..0cf0bd0a6 100644
--- a/debian/squeeze/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/applications/k3b/debian/README.Debian b/debian/_base/applications/k3b/debian/README.Debian
index f87a80e77..f87a80e77 100644
--- a/debian/squeeze/applications/k3b/debian/README.Debian
+++ b/debian/_base/applications/k3b/debian/README.Debian
diff --git a/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/k3b/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/k3b/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/k3b/debian/cdbs/kde.mk b/debian/_base/applications/k3b/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/k3b/debian/cdbs/kde.mk
+++ b/debian/_base/applications/k3b/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/k3b/debian/cdbs/versions.pl b/debian/_base/applications/k3b/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/k3b/debian/cdbs/versions.pl
+++ b/debian/_base/applications/k3b/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/k3b/debian/changelog b/debian/_base/applications/k3b/debian/changelog
index c1b283bb1..c1b283bb1 100644
--- a/debian/squeeze/applications/k3b/debian/changelog
+++ b/debian/_base/applications/k3b/debian/changelog
diff --git a/debian/squeeze/applications/k3b/debian/compat b/debian/_base/applications/k3b/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/k3b/debian/compat
+++ b/debian/_base/applications/k3b/debian/compat
diff --git a/debian/squeeze/applications/k3b/debian/control b/debian/_base/applications/k3b/debian/control
index d03d19446..d03d19446 100644
--- a/debian/squeeze/applications/k3b/debian/control
+++ b/debian/_base/applications/k3b/debian/control
diff --git a/debian/squeeze/applications/k3b/debian/copyright b/debian/_base/applications/k3b/debian/copyright
index b5022ab93..b5022ab93 100644
--- a/debian/squeeze/applications/k3b/debian/copyright
+++ b/debian/_base/applications/k3b/debian/copyright
diff --git a/debian/squeeze/applications/k3b/debian/docs b/debian/_base/applications/k3b/debian/docs
index 623fe2da9..623fe2da9 100644
--- a/debian/squeeze/applications/k3b/debian/docs
+++ b/debian/_base/applications/k3b/debian/docs
diff --git a/debian/squeeze/applications/k3b/debian/k3b-data-trinity.install b/debian/_base/applications/k3b/debian/k3b-data-trinity.install
index af584fe32..af584fe32 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-data-trinity.install
+++ b/debian/_base/applications/k3b/debian/k3b-data-trinity.install
diff --git a/debian/squeeze/applications/k3b/debian/k3b-data.files b/debian/_base/applications/k3b/debian/k3b-data.files
index 3b3a0add7..3b3a0add7 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-data.files
+++ b/debian/_base/applications/k3b/debian/k3b-data.files
diff --git a/debian/squeeze/applications/k3b/debian/k3b-data.install b/debian/_base/applications/k3b/debian/k3b-data.install
index b7175c514..b7175c514 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-data.install
+++ b/debian/_base/applications/k3b/debian/k3b-data.install
diff --git a/debian/squeeze/applications/k3b/debian/k3b-rip-audiocd.desktop b/debian/_base/applications/k3b/debian/k3b-rip-audiocd.desktop
index 2d7d24def..2d7d24def 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-rip-audiocd.desktop
+++ b/debian/_base/applications/k3b/debian/k3b-rip-audiocd.desktop
diff --git a/debian/squeeze/applications/k3b/debian/k3b-rip-videodvd.desktop b/debian/_base/applications/k3b/debian/k3b-rip-videodvd.desktop
index 627ed3a24..627ed3a24 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-rip-videodvd.desktop
+++ b/debian/_base/applications/k3b/debian/k3b-rip-videodvd.desktop
diff --git a/debian/squeeze/applications/k3b/debian/k3b-trinity.1 b/debian/_base/applications/k3b/debian/k3b-trinity.1
index abbd41f07..abbd41f07 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-trinity.1
+++ b/debian/_base/applications/k3b/debian/k3b-trinity.1
diff --git a/debian/squeeze/applications/k3b/debian/k3b-trinity.install b/debian/_base/applications/k3b/debian/k3b-trinity.install
index 8e0b27b98..8e0b27b98 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-trinity.install
+++ b/debian/_base/applications/k3b/debian/k3b-trinity.install
diff --git a/debian/squeeze/applications/k3b/debian/k3b-trinity.manpages b/debian/_base/applications/k3b/debian/k3b-trinity.manpages
index 328f16efe..328f16efe 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-trinity.manpages
+++ b/debian/_base/applications/k3b/debian/k3b-trinity.manpages
diff --git a/debian/squeeze/applications/k3b/debian/k3b-trinity.menu b/debian/_base/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..f07382ed8 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-trinity.menu
+++ b/debian/_base/applications/k3b/debian/k3b-trinity.menu
diff --git a/debian/squeeze/applications/k3b/debian/k3b-trinity.postinst b/debian/_base/applications/k3b/debian/k3b-trinity.postinst
index 3807d55e6..3807d55e6 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-trinity.postinst
+++ b/debian/_base/applications/k3b/debian/k3b-trinity.postinst
diff --git a/debian/squeeze/applications/k3b/debian/k3b-write-bin-image.desktop b/debian/_base/applications/k3b/debian/k3b-write-bin-image.desktop
index f1223957d..f1223957d 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-write-bin-image.desktop
+++ b/debian/_base/applications/k3b/debian/k3b-write-bin-image.desktop
diff --git a/debian/squeeze/applications/k3b/debian/k3b-write-iso-image.desktop b/debian/_base/applications/k3b/debian/k3b-write-iso-image.desktop
index bc8b04a50..bc8b04a50 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-write-iso-image.desktop
+++ b/debian/_base/applications/k3b/debian/k3b-write-iso-image.desktop
diff --git a/debian/squeeze/applications/k3b/debian/k3b.files b/debian/_base/applications/k3b/debian/k3b.files
index d6388a5b6..d6388a5b6 100644
--- a/debian/squeeze/applications/k3b/debian/k3b.files
+++ b/debian/_base/applications/k3b/debian/k3b.files
diff --git a/debian/squeeze/applications/k3b/debian/k3b.install b/debian/_base/applications/k3b/debian/k3b.install
index 72cf96bb3..72cf96bb3 100644
--- a/debian/squeeze/applications/k3b/debian/k3b.install
+++ b/debian/_base/applications/k3b/debian/k3b.install
diff --git a/debian/squeeze/applications/k3b/debian/k3b.manpages b/debian/_base/applications/k3b/debian/k3b.manpages
index 60dde70bc..60dde70bc 100644
--- a/debian/squeeze/applications/k3b/debian/k3b.manpages
+++ b/debian/_base/applications/k3b/debian/k3b.manpages
diff --git a/debian/squeeze/applications/k3b/debian/k3b.menu b/debian/_base/applications/k3b/debian/k3b.menu
index c6f95c029..c6f95c029 100644
--- a/debian/squeeze/applications/k3b/debian/k3b.menu
+++ b/debian/_base/applications/k3b/debian/k3b.menu
diff --git a/debian/squeeze/applications/k3b/debian/k3b.postinst b/debian/_base/applications/k3b/debian/k3b.postinst
index 3807d55e6..3807d55e6 100644
--- a/debian/squeeze/applications/k3b/debian/k3b.postinst
+++ b/debian/_base/applications/k3b/debian/k3b.postinst
diff --git a/debian/squeeze/applications/k3b/debian/k3b.xpm b/debian/_base/applications/k3b/debian/k3b.xpm
index a7748bac4..a7748bac4 100644
--- a/debian/squeeze/applications/k3b/debian/k3b.xpm
+++ b/debian/_base/applications/k3b/debian/k3b.xpm
diff --git a/debian/squeeze/applications/k3b/debian/libk3b-dev.files b/debian/_base/applications/k3b/debian/libk3b-dev.files
index d45003d06..d45003d06 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b-dev.files
+++ b/debian/_base/applications/k3b/debian/libk3b-dev.files
diff --git a/debian/squeeze/applications/k3b/debian/libk3b-dev.install b/debian/_base/applications/k3b/debian/libk3b-dev.install
index 6257a06d1..6257a06d1 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b-dev.install
+++ b/debian/_base/applications/k3b/debian/libk3b-dev.install
diff --git a/debian/squeeze/applications/k3b/debian/libk3b-trinity-dev.install b/debian/_base/applications/k3b/debian/libk3b-trinity-dev.install
index 575f91fdb..575f91fdb 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b-trinity-dev.install
+++ b/debian/_base/applications/k3b/debian/libk3b-trinity-dev.install
diff --git a/debian/squeeze/applications/k3b/debian/libk3b3-extracodecs-trinity.install b/debian/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install
index d806398ef..d806398ef 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b3-extracodecs-trinity.install
+++ b/debian/_base/applications/k3b/debian/libk3b3-extracodecs-trinity.install
diff --git a/debian/squeeze/applications/k3b/debian/libk3b3-extracodecs.install b/debian/_base/applications/k3b/debian/libk3b3-extracodecs.install
index 0e57a97dc..0e57a97dc 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b3-extracodecs.install
+++ b/debian/_base/applications/k3b/debian/libk3b3-extracodecs.install
diff --git a/debian/squeeze/applications/k3b/debian/libk3b3-trinity.install b/debian/_base/applications/k3b/debian/libk3b3-trinity.install
index e18a34c1c..e18a34c1c 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b3-trinity.install
+++ b/debian/_base/applications/k3b/debian/libk3b3-trinity.install
diff --git a/debian/squeeze/applications/k3b/debian/libk3b3.files b/debian/_base/applications/k3b/debian/libk3b3.files
index d77e53e7c..d77e53e7c 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b3.files
+++ b/debian/_base/applications/k3b/debian/libk3b3.files
diff --git a/debian/squeeze/applications/k3b/debian/libk3b3.install b/debian/_base/applications/k3b/debian/libk3b3.install
index f5c557815..f5c557815 100644
--- a/debian/squeeze/applications/k3b/debian/libk3b3.install
+++ b/debian/_base/applications/k3b/debian/libk3b3.install
diff --git a/debian/squeeze/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/debian/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
index dc44bfdb8..dc44bfdb8 100644
--- a/debian/squeeze/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
+++ b/debian/_base/applications/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
diff --git a/debian/squeeze/applications/k3b/debian/patches/series b/debian/_base/applications/k3b/debian/patches/series
index bff63cb8c..bff63cb8c 100644
--- a/debian/squeeze/applications/k3b/debian/patches/series
+++ b/debian/_base/applications/k3b/debian/patches/series
diff --git a/debian/squeeze/applications/k3b/debian/rules b/debian/_base/applications/k3b/debian/rules
index f4f5b0012..f4f5b0012 100755
--- a/debian/squeeze/applications/k3b/debian/rules
+++ b/debian/_base/applications/k3b/debian/rules
diff --git a/debian/squeeze/applications/k3b/debian/source/format b/debian/_base/applications/k3b/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/k3b/debian/source/format
+++ b/debian/_base/applications/k3b/debian/source/format
diff --git a/debian/squeeze/applications/k3b/debian/source/options b/debian/_base/applications/k3b/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/k3b/debian/source/options
+++ b/debian/_base/applications/k3b/debian/source/options
diff --git a/debian/squeeze/applications/k3b/debian/watch b/debian/_base/applications/k3b/debian/watch
index 7e3c554ae..7e3c554ae 100644
--- a/debian/squeeze/applications/k3b/debian/watch
+++ b/debian/_base/applications/k3b/debian/watch
diff --git a/debian/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/k9copy/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk b/debian/_base/applications/k9copy/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk
+++ b/debian/_base/applications/k9copy/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/k9copy/debian/cdbs/versions.pl b/debian/_base/applications/k9copy/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/k9copy/debian/cdbs/versions.pl
+++ b/debian/_base/applications/k9copy/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/k9copy/debian/changelog b/debian/_base/applications/k9copy/debian/changelog
index 5220703ba..5220703ba 100644
--- a/debian/squeeze/applications/k9copy/debian/changelog
+++ b/debian/_base/applications/k9copy/debian/changelog
diff --git a/debian/squeeze/applications/k9copy/debian/compat b/debian/_base/applications/k9copy/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/k9copy/debian/compat
+++ b/debian/_base/applications/k9copy/debian/compat
diff --git a/debian/squeeze/applications/k9copy/debian/control b/debian/_base/applications/k9copy/debian/control
index 0170482bb..0170482bb 100644
--- a/debian/squeeze/applications/k9copy/debian/control
+++ b/debian/_base/applications/k9copy/debian/control
diff --git a/debian/squeeze/applications/k9copy/debian/copyright b/debian/_base/applications/k9copy/debian/copyright
index c08901dd0..c08901dd0 100644
--- a/debian/squeeze/applications/k9copy/debian/copyright
+++ b/debian/_base/applications/k9copy/debian/copyright
diff --git a/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook b/debian/_base/applications/k9copy/debian/k9copy.1.docbook
index d3fd4d792..d3fd4d792 100644
--- a/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook
+++ b/debian/_base/applications/k9copy/debian/k9copy.1.docbook
diff --git a/debian/squeeze/applications/k9copy/debian/patches/series b/debian/_base/applications/k9copy/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/k9copy/debian/patches/series
+++ b/debian/_base/applications/k9copy/debian/patches/series
diff --git a/debian/squeeze/applications/k9copy/debian/rules b/debian/_base/applications/k9copy/debian/rules
index 6761a0c33..6761a0c33 100755
--- a/debian/squeeze/applications/k9copy/debian/rules
+++ b/debian/_base/applications/k9copy/debian/rules
diff --git a/debian/squeeze/applications/k9copy/debian/source/format b/debian/_base/applications/k9copy/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/k9copy/debian/source/format
+++ b/debian/_base/applications/k9copy/debian/source/format
diff --git a/debian/squeeze/applications/k9copy/debian/source/options b/debian/_base/applications/k9copy/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/k9copy/debian/source/options
+++ b/debian/_base/applications/k9copy/debian/source/options
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/changelog b/debian/_base/applications/kaffeine-mozilla/debian/changelog
index 7e3c2a0fd..7e3c2a0fd 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/changelog
+++ b/debian/_base/applications/kaffeine-mozilla/debian/changelog
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/compat b/debian/_base/applications/kaffeine-mozilla/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/compat
+++ b/debian/_base/applications/kaffeine-mozilla/debian/compat
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/control b/debian/_base/applications/kaffeine-mozilla/debian/control
index 28fc31cd0..28fc31cd0 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/control
+++ b/debian/_base/applications/kaffeine-mozilla/debian/control
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/copyright b/debian/_base/applications/kaffeine-mozilla/debian/copyright
index d7092f934..d7092f934 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/copyright
+++ b/debian/_base/applications/kaffeine-mozilla/debian/copyright
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/docs b/debian/_base/applications/kaffeine-mozilla/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/docs
+++ b/debian/_base/applications/kaffeine-mozilla/debian/docs
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install b/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
index 30f14a91f..30f14a91f 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
+++ b/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.install
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links b/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
index 372fe38d5..372fe38d5 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
+++ b/debian/_base/applications/kaffeine-mozilla/debian/kaffeine-mozilla.links
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/rules b/debian/_base/applications/kaffeine-mozilla/debian/rules
index 08c10c248..08c10c248 100755
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/rules
+++ b/debian/_base/applications/kaffeine-mozilla/debian/rules
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/source/format b/debian/_base/applications/kaffeine-mozilla/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/source/format
+++ b/debian/_base/applications/kaffeine-mozilla/debian/source/format
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/source/options b/debian/_base/applications/kaffeine-mozilla/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/source/options
+++ b/debian/_base/applications/kaffeine-mozilla/debian/source/options
diff --git a/debian/squeeze/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 1d06672c7..1d06672c7 100644
--- a/debian/squeeze/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/kaffeine/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/applications/kaffeine/debian/README.Debian b/debian/_base/applications/kaffeine/debian/README.Debian
index 74cac614e..74cac614e 100644
--- a/debian/squeeze/applications/kaffeine/debian/README.Debian
+++ b/debian/_base/applications/kaffeine/debian/README.Debian
diff --git a/debian/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk b/debian/_base/applications/kaffeine/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kaffeine/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kaffeine/debian/cdbs/versions.pl b/debian/_base/applications/kaffeine/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kaffeine/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kaffeine/debian/changelog b/debian/_base/applications/kaffeine/debian/changelog
index 63b3d1a72..63b3d1a72 100644
--- a/debian/squeeze/applications/kaffeine/debian/changelog
+++ b/debian/_base/applications/kaffeine/debian/changelog
diff --git a/debian/squeeze/applications/kaffeine/debian/compat b/debian/_base/applications/kaffeine/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kaffeine/debian/compat
+++ b/debian/_base/applications/kaffeine/debian/compat
diff --git a/debian/squeeze/applications/kaffeine/debian/control b/debian/_base/applications/kaffeine/debian/control
index 56ee6c3e3..56ee6c3e3 100644
--- a/debian/squeeze/applications/kaffeine/debian/control
+++ b/debian/_base/applications/kaffeine/debian/control
diff --git a/debian/squeeze/applications/kaffeine/debian/copyright b/debian/_base/applications/kaffeine/debian/copyright
index 8b7ddae56..8b7ddae56 100644
--- a/debian/squeeze/applications/kaffeine/debian/copyright
+++ b/debian/_base/applications/kaffeine/debian/copyright
diff --git a/debian/squeeze/applications/kaffeine/debian/docs b/debian/_base/applications/kaffeine/debian/docs
index 194085499..194085499 100644
--- a/debian/squeeze/applications/kaffeine/debian/docs
+++ b/debian/_base/applications/kaffeine/debian/docs
diff --git a/debian/squeeze/applications/kaffeine/debian/install-codecs b/debian/_base/applications/kaffeine/debian/install-codecs
index 271285c4e..271285c4e 100644
--- a/debian/squeeze/applications/kaffeine/debian/install-codecs
+++ b/debian/_base/applications/kaffeine/debian/install-codecs
diff --git a/debian/squeeze/applications/kaffeine/debian/install-css.sh b/debian/_base/applications/kaffeine/debian/install-css.sh
index f374562ff..f374562ff 100644
--- a/debian/squeeze/applications/kaffeine/debian/install-css.sh
+++ b/debian/_base/applications/kaffeine/debian/install-css.sh
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install b/debian/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
index cddfdc50f..cddfdc50f 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
+++ b/debian/_base/applications/kaffeine/debian/kaffeine-gstreamer-trinity.install
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine-iso.desktop b/debian/_base/applications/kaffeine/debian/kaffeine-iso.desktop
index c1d407f15..c1d407f15 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-iso.desktop
+++ b/debian/_base/applications/kaffeine/debian/kaffeine-iso.desktop
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install b/debian/_base/applications/kaffeine/debian/kaffeine-trinity.install
index 825837cba..825837cba 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install
+++ b/debian/_base/applications/kaffeine/debian/kaffeine-trinity.install
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides b/debian/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
index 2e7541445..2e7541445 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
+++ b/debian/_base/applications/kaffeine/debian/kaffeine-trinity.lintian-overrides
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine.1 b/debian/_base/applications/kaffeine/debian/kaffeine.1
index ca6de5bc7..ca6de5bc7 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine.1
+++ b/debian/_base/applications/kaffeine/debian/kaffeine.1
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine.xpm b/debian/_base/applications/kaffeine/debian/kaffeine.xpm
index 255d651d9..255d651d9 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine.xpm
+++ b/debian/_base/applications/kaffeine/debian/kaffeine.xpm
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine_codecinstall.desktop b/debian/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop
index 25ec5689c..25ec5689c 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine_codecinstall.desktop
+++ b/debian/_base/applications/kaffeine/debian/kaffeine_codecinstall.desktop
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop b/debian/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
index 7b4adb8d9..7b4adb8d9 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
+++ b/debian/_base/applications/kaffeine/debian/kaffeine_xine-install-dvdcss.desktop
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop b/debian/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
index a022ecda3..a022ecda3 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
+++ b/debian/_base/applications/kaffeine/debian/kaffeine_xine-install-ffmpeg.desktop
diff --git a/debian/squeeze/applications/kaffeine/debian/menu b/debian/_base/applications/kaffeine/debian/menu
index 4314c464a..4314c464a 100644
--- a/debian/squeeze/applications/kaffeine/debian/menu
+++ b/debian/_base/applications/kaffeine/debian/menu
diff --git a/debian/squeeze/applications/kaffeine/debian/patches/series b/debian/_base/applications/kaffeine/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kaffeine/debian/patches/series
+++ b/debian/_base/applications/kaffeine/debian/patches/series
diff --git a/debian/squeeze/applications/kaffeine/debian/rules b/debian/_base/applications/kaffeine/debian/rules
index 1add9ec5d..1add9ec5d 100755
--- a/debian/squeeze/applications/kaffeine/debian/rules
+++ b/debian/_base/applications/kaffeine/debian/rules
diff --git a/debian/squeeze/applications/kaffeine/debian/source/format b/debian/_base/applications/kaffeine/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kaffeine/debian/source/format
+++ b/debian/_base/applications/kaffeine/debian/source/format
diff --git a/debian/squeeze/applications/kaffeine/debian/source/options b/debian/_base/applications/kaffeine/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kaffeine/debian/source/options
+++ b/debian/_base/applications/kaffeine/debian/source/options
diff --git a/debian/squeeze/applications/kaffeine/debian/watch b/debian/_base/applications/kaffeine/debian/watch
index 3f054ccd4..3f054ccd4 100644
--- a/debian/squeeze/applications/kaffeine/debian/watch
+++ b/debian/_base/applications/kaffeine/debian/watch
diff --git a/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/katapult/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/katapult/debian/cdbs/kde.mk b/debian/_base/applications/katapult/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/katapult/debian/cdbs/kde.mk
+++ b/debian/_base/applications/katapult/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/katapult/debian/cdbs/versions.pl b/debian/_base/applications/katapult/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/katapult/debian/cdbs/versions.pl
+++ b/debian/_base/applications/katapult/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/katapult/debian/changelog b/debian/_base/applications/katapult/debian/changelog
index 4452b8a56..4452b8a56 100644
--- a/debian/squeeze/applications/katapult/debian/changelog
+++ b/debian/_base/applications/katapult/debian/changelog
diff --git a/debian/squeeze/applications/katapult/debian/compat b/debian/_base/applications/katapult/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/katapult/debian/compat
+++ b/debian/_base/applications/katapult/debian/compat
diff --git a/debian/squeeze/applications/katapult/debian/control b/debian/_base/applications/katapult/debian/control
index 085d37c0d..085d37c0d 100644
--- a/debian/squeeze/applications/katapult/debian/control
+++ b/debian/_base/applications/katapult/debian/control
diff --git a/debian/squeeze/applications/katapult/debian/copyright b/debian/_base/applications/katapult/debian/copyright
index fa75bbec3..fa75bbec3 100644
--- a/debian/squeeze/applications/katapult/debian/copyright
+++ b/debian/_base/applications/katapult/debian/copyright
diff --git a/debian/squeeze/applications/katapult/debian/docs b/debian/_base/applications/katapult/debian/docs
index 022850854..022850854 100644
--- a/debian/squeeze/applications/katapult/debian/docs
+++ b/debian/_base/applications/katapult/debian/docs
diff --git a/debian/squeeze/applications/katapult/debian/katapult.1.docbook b/debian/_base/applications/katapult/debian/katapult.1.docbook
index 718ff8707..718ff8707 100644
--- a/debian/squeeze/applications/katapult/debian/katapult.1.docbook
+++ b/debian/_base/applications/katapult/debian/katapult.1.docbook
diff --git a/debian/squeeze/applications/katapult/debian/lintian b/debian/_base/applications/katapult/debian/lintian
index af70e7550..af70e7550 100644
--- a/debian/squeeze/applications/katapult/debian/lintian
+++ b/debian/_base/applications/katapult/debian/lintian
diff --git a/debian/squeeze/applications/katapult/debian/menu b/debian/_base/applications/katapult/debian/menu
index a76f261ac..a76f261ac 100644
--- a/debian/squeeze/applications/katapult/debian/menu
+++ b/debian/_base/applications/katapult/debian/menu
diff --git a/debian/squeeze/applications/katapult/debian/patches/series b/debian/_base/applications/katapult/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/katapult/debian/patches/series
+++ b/debian/_base/applications/katapult/debian/patches/series
diff --git a/debian/squeeze/applications/katapult/debian/rules b/debian/_base/applications/katapult/debian/rules
index da2411aad..da2411aad 100755
--- a/debian/squeeze/applications/katapult/debian/rules
+++ b/debian/_base/applications/katapult/debian/rules
diff --git a/debian/squeeze/applications/katapult/debian/source/format b/debian/_base/applications/katapult/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/katapult/debian/source/format
+++ b/debian/_base/applications/katapult/debian/source/format
diff --git a/debian/squeeze/applications/katapult/debian/source/options b/debian/_base/applications/katapult/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/katapult/debian/source/options
+++ b/debian/_base/applications/katapult/debian/source/options
diff --git a/debian/squeeze/applications/kbarcode/debian/README.Debian b/debian/_base/applications/kbarcode/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/squeeze/applications/kbarcode/debian/README.Debian
+++ b/debian/_base/applications/kbarcode/debian/README.Debian
diff --git a/debian/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk b/debian/_base/applications/kbarcode/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kbarcode/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kbarcode/debian/cdbs/versions.pl b/debian/_base/applications/kbarcode/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kbarcode/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kbarcode/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kbarcode/debian/changelog b/debian/_base/applications/kbarcode/debian/changelog
index df15715c2..df15715c2 100644
--- a/debian/squeeze/applications/kbarcode/debian/changelog
+++ b/debian/_base/applications/kbarcode/debian/changelog
diff --git a/debian/squeeze/applications/kbarcode/debian/compat b/debian/_base/applications/kbarcode/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kbarcode/debian/compat
+++ b/debian/_base/applications/kbarcode/debian/compat
diff --git a/debian/squeeze/applications/kbarcode/debian/control b/debian/_base/applications/kbarcode/debian/control
index f1e938799..f1e938799 100644
--- a/debian/squeeze/applications/kbarcode/debian/control
+++ b/debian/_base/applications/kbarcode/debian/control
diff --git a/debian/squeeze/applications/kbarcode/debian/copyright b/debian/_base/applications/kbarcode/debian/copyright
index 37bf717a2..37bf717a2 100644
--- a/debian/squeeze/applications/kbarcode/debian/copyright
+++ b/debian/_base/applications/kbarcode/debian/copyright
diff --git a/debian/squeeze/applications/kbarcode/debian/docs b/debian/_base/applications/kbarcode/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/kbarcode/debian/docs
+++ b/debian/_base/applications/kbarcode/debian/docs
diff --git a/debian/squeeze/applications/kbarcode/debian/kbarcode.1 b/debian/_base/applications/kbarcode/debian/kbarcode.1
index 12d3bfaad..12d3bfaad 100644
--- a/debian/squeeze/applications/kbarcode/debian/kbarcode.1
+++ b/debian/_base/applications/kbarcode/debian/kbarcode.1
diff --git a/debian/squeeze/applications/kbarcode/debian/menu b/debian/_base/applications/kbarcode/debian/menu
index 48b3f8eff..48b3f8eff 100644
--- a/debian/squeeze/applications/kbarcode/debian/menu
+++ b/debian/_base/applications/kbarcode/debian/menu
diff --git a/debian/squeeze/applications/kbarcode/debian/patches/.gitignore b/debian/_base/applications/kbarcode/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kbarcode/debian/patches/.gitignore
+++ b/debian/_base/applications/kbarcode/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/kbarcode/debian/rules b/debian/_base/applications/kbarcode/debian/rules
index 38399c77f..38399c77f 100755
--- a/debian/squeeze/applications/kbarcode/debian/rules
+++ b/debian/_base/applications/kbarcode/debian/rules
diff --git a/debian/squeeze/applications/kbarcode/debian/source.lintian-overrides b/debian/_base/applications/kbarcode/debian/source.lintian-overrides
index cb165370f..cb165370f 100644
--- a/debian/squeeze/applications/kbarcode/debian/source.lintian-overrides
+++ b/debian/_base/applications/kbarcode/debian/source.lintian-overrides
diff --git a/debian/squeeze/applications/kbarcode/debian/source/format b/debian/_base/applications/kbarcode/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kbarcode/debian/source/format
+++ b/debian/_base/applications/kbarcode/debian/source/format
diff --git a/debian/squeeze/applications/kbarcode/debian/source/options b/debian/_base/applications/kbarcode/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kbarcode/debian/source/options
+++ b/debian/_base/applications/kbarcode/debian/source/options
diff --git a/debian/squeeze/applications/kbarcode/debian/watch b/debian/_base/applications/kbarcode/debian/watch
index f0291570e..f0291570e 100644
--- a/debian/squeeze/applications/kbarcode/debian/watch
+++ b/debian/_base/applications/kbarcode/debian/watch
diff --git a/debian/squeeze/applications/kbfx/debian/README.Debian b/debian/_base/applications/kbfx/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/squeeze/applications/kbfx/debian/README.Debian
+++ b/debian/_base/applications/kbfx/debian/README.Debian
diff --git a/debian/squeeze/applications/kbfx/debian/changelog b/debian/_base/applications/kbfx/debian/changelog
index cbb743bf9..cbb743bf9 100644
--- a/debian/squeeze/applications/kbfx/debian/changelog
+++ b/debian/_base/applications/kbfx/debian/changelog
diff --git a/debian/squeeze/applications/kbfx/debian/cmake.mk b/debian/_base/applications/kbfx/debian/cmake.mk
index 4c7e2e24c..4c7e2e24c 100644
--- a/debian/squeeze/applications/kbfx/debian/cmake.mk
+++ b/debian/_base/applications/kbfx/debian/cmake.mk
diff --git a/debian/squeeze/applications/kbfx/debian/compat b/debian/_base/applications/kbfx/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kbfx/debian/compat
+++ b/debian/_base/applications/kbfx/debian/compat
diff --git a/debian/squeeze/applications/kbfx/debian/control b/debian/_base/applications/kbfx/debian/control
index 05997f826..05997f826 100644
--- a/debian/squeeze/applications/kbfx/debian/control
+++ b/debian/_base/applications/kbfx/debian/control
diff --git a/debian/squeeze/applications/kbfx/debian/copyright b/debian/_base/applications/kbfx/debian/copyright
index 11d23df1b..11d23df1b 100644
--- a/debian/squeeze/applications/kbfx/debian/copyright
+++ b/debian/_base/applications/kbfx/debian/copyright
diff --git a/debian/squeeze/applications/kbfx/debian/docs b/debian/_base/applications/kbfx/debian/docs
index 4182e08ae..4182e08ae 100644
--- a/debian/squeeze/applications/kbfx/debian/docs
+++ b/debian/_base/applications/kbfx/debian/docs
diff --git a/debian/squeeze/applications/kbfx/debian/kbfx.lintian-overrides b/debian/_base/applications/kbfx/debian/kbfx.lintian-overrides
index a2ecfe7dc..a2ecfe7dc 100644
--- a/debian/squeeze/applications/kbfx/debian/kbfx.lintian-overrides
+++ b/debian/_base/applications/kbfx/debian/kbfx.lintian-overrides
diff --git a/debian/squeeze/applications/kbfx/debian/patches/series b/debian/_base/applications/kbfx/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kbfx/debian/patches/series
+++ b/debian/_base/applications/kbfx/debian/patches/series
diff --git a/debian/squeeze/applications/kbfx/debian/postinst b/debian/_base/applications/kbfx/debian/postinst
index e95a6906b..e95a6906b 100644
--- a/debian/squeeze/applications/kbfx/debian/postinst
+++ b/debian/_base/applications/kbfx/debian/postinst
diff --git a/debian/squeeze/applications/kbfx/debian/rules b/debian/_base/applications/kbfx/debian/rules
index e839edd42..e839edd42 100755
--- a/debian/squeeze/applications/kbfx/debian/rules
+++ b/debian/_base/applications/kbfx/debian/rules
diff --git a/debian/squeeze/applications/kbfx/debian/source/format b/debian/_base/applications/kbfx/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kbfx/debian/source/format
+++ b/debian/_base/applications/kbfx/debian/source/format
diff --git a/debian/squeeze/applications/kbfx/debian/source/options b/debian/_base/applications/kbfx/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kbfx/debian/source/options
+++ b/debian/_base/applications/kbfx/debian/source/options
diff --git a/debian/squeeze/applications/kbfx/debian/watch b/debian/_base/applications/kbfx/debian/watch
index cfc9a7d7d..cfc9a7d7d 100644
--- a/debian/squeeze/applications/kbfx/debian/watch
+++ b/debian/_base/applications/kbfx/debian/watch
diff --git a/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kbibtex/debian/cdbs/kde.mk b/debian/_base/applications/kbibtex/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kbibtex/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kbibtex/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kbibtex/debian/cdbs/versions.pl b/debian/_base/applications/kbibtex/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kbibtex/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kbibtex/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kbibtex/debian/changelog b/debian/_base/applications/kbibtex/debian/changelog
index c06f2a183..c06f2a183 100644
--- a/debian/squeeze/applications/kbibtex/debian/changelog
+++ b/debian/_base/applications/kbibtex/debian/changelog
diff --git a/debian/squeeze/applications/kbibtex/debian/compat b/debian/_base/applications/kbibtex/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kbibtex/debian/compat
+++ b/debian/_base/applications/kbibtex/debian/compat
diff --git a/debian/squeeze/applications/kbibtex/debian/control b/debian/_base/applications/kbibtex/debian/control
index a85448cb6..a85448cb6 100644
--- a/debian/squeeze/applications/kbibtex/debian/control
+++ b/debian/_base/applications/kbibtex/debian/control
diff --git a/debian/squeeze/applications/kbibtex/debian/copyright b/debian/_base/applications/kbibtex/debian/copyright
index a3860eab7..a3860eab7 100644
--- a/debian/squeeze/applications/kbibtex/debian/copyright
+++ b/debian/_base/applications/kbibtex/debian/copyright
diff --git a/debian/squeeze/applications/kbibtex/debian/docs b/debian/_base/applications/kbibtex/debian/docs
index 166765aba..166765aba 100644
--- a/debian/squeeze/applications/kbibtex/debian/docs
+++ b/debian/_base/applications/kbibtex/debian/docs
diff --git a/debian/squeeze/applications/kbibtex/debian/menu b/debian/_base/applications/kbibtex/debian/menu
index 63d91bc0c..63d91bc0c 100644
--- a/debian/squeeze/applications/kbibtex/debian/menu
+++ b/debian/_base/applications/kbibtex/debian/menu
diff --git a/debian/squeeze/applications/kbibtex/debian/rules b/debian/_base/applications/kbibtex/debian/rules
index 08dc66d68..08dc66d68 100755
--- a/debian/squeeze/applications/kbibtex/debian/rules
+++ b/debian/_base/applications/kbibtex/debian/rules
diff --git a/debian/squeeze/applications/kbibtex/debian/source/format b/debian/_base/applications/kbibtex/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kbibtex/debian/source/format
+++ b/debian/_base/applications/kbibtex/debian/source/format
diff --git a/debian/squeeze/applications/kbibtex/debian/source/options b/debian/_base/applications/kbibtex/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kbibtex/debian/source/options
+++ b/debian/_base/applications/kbibtex/debian/source/options
diff --git a/debian/squeeze/applications/kbibtex/debian/watch b/debian/_base/applications/kbibtex/debian/watch
index a0b02fa2d..a0b02fa2d 100644
--- a/debian/squeeze/applications/kbibtex/debian/watch
+++ b/debian/_base/applications/kbibtex/debian/watch
diff --git a/debian/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kbiff/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kbiff/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kbiff/debian/cdbs/kde.mk b/debian/_base/applications/kbiff/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kbiff/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kbiff/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kbiff/debian/cdbs/versions.pl b/debian/_base/applications/kbiff/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kbiff/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kbiff/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kbiff/debian/changelog b/debian/_base/applications/kbiff/debian/changelog
index bf7871f3b..bf7871f3b 100644
--- a/debian/squeeze/applications/kbiff/debian/changelog
+++ b/debian/_base/applications/kbiff/debian/changelog
diff --git a/debian/squeeze/applications/kbiff/debian/compat b/debian/_base/applications/kbiff/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kbiff/debian/compat
+++ b/debian/_base/applications/kbiff/debian/compat
diff --git a/debian/squeeze/applications/kbiff/debian/control b/debian/_base/applications/kbiff/debian/control
index 3ce16eb96..3ce16eb96 100644
--- a/debian/squeeze/applications/kbiff/debian/control
+++ b/debian/_base/applications/kbiff/debian/control
diff --git a/debian/squeeze/applications/kbiff/debian/copyright b/debian/_base/applications/kbiff/debian/copyright
index f2ff3daec..f2ff3daec 100644
--- a/debian/squeeze/applications/kbiff/debian/copyright
+++ b/debian/_base/applications/kbiff/debian/copyright
diff --git a/debian/squeeze/applications/kbiff/debian/dirs b/debian/_base/applications/kbiff/debian/dirs
index f583045fe..f583045fe 100644
--- a/debian/squeeze/applications/kbiff/debian/dirs
+++ b/debian/_base/applications/kbiff/debian/dirs
diff --git a/debian/squeeze/applications/kbiff/debian/docs b/debian/_base/applications/kbiff/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/debian/squeeze/applications/kbiff/debian/docs
+++ b/debian/_base/applications/kbiff/debian/docs
diff --git a/debian/squeeze/applications/kbiff/debian/menu b/debian/_base/applications/kbiff/debian/menu
index ab7f8c6e7..ab7f8c6e7 100644
--- a/debian/squeeze/applications/kbiff/debian/menu
+++ b/debian/_base/applications/kbiff/debian/menu
diff --git a/debian/squeeze/applications/kbiff/debian/rules b/debian/_base/applications/kbiff/debian/rules
index af3e5e01d..af3e5e01d 100755
--- a/debian/squeeze/applications/kbiff/debian/rules
+++ b/debian/_base/applications/kbiff/debian/rules
diff --git a/debian/squeeze/applications/kbiff/debian/source/format b/debian/_base/applications/kbiff/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kbiff/debian/source/format
+++ b/debian/_base/applications/kbiff/debian/source/format
diff --git a/debian/squeeze/applications/kbiff/debian/source/options b/debian/_base/applications/kbiff/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kbiff/debian/source/options
+++ b/debian/_base/applications/kbiff/debian/source/options
diff --git a/debian/squeeze/applications/kbiff/debian/watch b/debian/_base/applications/kbiff/debian/watch
index eb0794476..eb0794476 100644
--- a/debian/squeeze/applications/kbiff/debian/watch
+++ b/debian/_base/applications/kbiff/debian/watch
diff --git a/debian/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk b/debian/_base/applications/kbookreader/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kbookreader/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kbookreader/debian/cdbs/versions.pl b/debian/_base/applications/kbookreader/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kbookreader/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kbookreader/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kbookreader/debian/changelog b/debian/_base/applications/kbookreader/debian/changelog
index 2d836d558..2d836d558 100644
--- a/debian/squeeze/applications/kbookreader/debian/changelog
+++ b/debian/_base/applications/kbookreader/debian/changelog
diff --git a/debian/squeeze/applications/kbookreader/debian/compat b/debian/_base/applications/kbookreader/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kbookreader/debian/compat
+++ b/debian/_base/applications/kbookreader/debian/compat
diff --git a/debian/squeeze/applications/kbookreader/debian/control b/debian/_base/applications/kbookreader/debian/control
index f3c8439df..f3c8439df 100644
--- a/debian/squeeze/applications/kbookreader/debian/control
+++ b/debian/_base/applications/kbookreader/debian/control
diff --git a/debian/squeeze/applications/kbookreader/debian/copyright b/debian/_base/applications/kbookreader/debian/copyright
index 8d31bf1da..8d31bf1da 100644
--- a/debian/squeeze/applications/kbookreader/debian/copyright
+++ b/debian/_base/applications/kbookreader/debian/copyright
diff --git a/debian/squeeze/applications/kbookreader/debian/patches/series b/debian/_base/applications/kbookreader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kbookreader/debian/patches/series
+++ b/debian/_base/applications/kbookreader/debian/patches/series
diff --git a/debian/squeeze/applications/kbookreader/debian/rules b/debian/_base/applications/kbookreader/debian/rules
index 780803d59..780803d59 100755
--- a/debian/squeeze/applications/kbookreader/debian/rules
+++ b/debian/_base/applications/kbookreader/debian/rules
diff --git a/debian/squeeze/applications/kbookreader/debian/source/format b/debian/_base/applications/kbookreader/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kbookreader/debian/source/format
+++ b/debian/_base/applications/kbookreader/debian/source/format
diff --git a/debian/squeeze/applications/kbookreader/debian/source/options b/debian/_base/applications/kbookreader/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kbookreader/debian/source/options
+++ b/debian/_base/applications/kbookreader/debian/source/options
diff --git a/debian/squeeze/applications/kchmviewer/debian/additions/kchmviewer.1 b/debian/_base/applications/kchmviewer/debian/additions/kchmviewer.1
index 8598644e6..8598644e6 100644
--- a/debian/squeeze/applications/kchmviewer/debian/additions/kchmviewer.1
+++ b/debian/_base/applications/kchmviewer/debian/additions/kchmviewer.1
diff --git a/debian/squeeze/applications/kchmviewer/debian/changelog b/debian/_base/applications/kchmviewer/debian/changelog
index 91fe29383..91fe29383 100644
--- a/debian/squeeze/applications/kchmviewer/debian/changelog
+++ b/debian/_base/applications/kchmviewer/debian/changelog
diff --git a/debian/squeeze/applications/kchmviewer/debian/compat b/debian/_base/applications/kchmviewer/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kchmviewer/debian/compat
+++ b/debian/_base/applications/kchmviewer/debian/compat
diff --git a/debian/squeeze/applications/kchmviewer/debian/control b/debian/_base/applications/kchmviewer/debian/control
index 717e0f3ba..717e0f3ba 100644
--- a/debian/squeeze/applications/kchmviewer/debian/control
+++ b/debian/_base/applications/kchmviewer/debian/control
diff --git a/debian/squeeze/applications/kchmviewer/debian/copyright b/debian/_base/applications/kchmviewer/debian/copyright
index b221828b7..b221828b7 100644
--- a/debian/squeeze/applications/kchmviewer/debian/copyright
+++ b/debian/_base/applications/kchmviewer/debian/copyright
diff --git a/debian/squeeze/applications/kchmviewer/debian/debiandirs b/debian/_base/applications/kchmviewer/debian/debiandirs
index 22e3692f0..22e3692f0 100644
--- a/debian/squeeze/applications/kchmviewer/debian/debiandirs
+++ b/debian/_base/applications/kchmviewer/debian/debiandirs
diff --git a/debian/squeeze/applications/kchmviewer/debian/dirs b/debian/_base/applications/kchmviewer/debian/dirs
index 9d345cd36..9d345cd36 100644
--- a/debian/squeeze/applications/kchmviewer/debian/dirs
+++ b/debian/_base/applications/kchmviewer/debian/dirs
diff --git a/debian/squeeze/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages b/debian/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
index eb0e0bf59..eb0e0bf59 100644
--- a/debian/squeeze/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
+++ b/debian/_base/applications/kchmviewer/debian/kchmviewer-nokde-trinity.manpages
diff --git a/debian/squeeze/applications/kchmviewer/debian/manpages b/debian/_base/applications/kchmviewer/debian/manpages
index eb0e0bf59..eb0e0bf59 100644
--- a/debian/squeeze/applications/kchmviewer/debian/manpages
+++ b/debian/_base/applications/kchmviewer/debian/manpages
diff --git a/debian/squeeze/applications/kchmviewer/debian/menu b/debian/_base/applications/kchmviewer/debian/menu
index 00508b25c..00508b25c 100644
--- a/debian/squeeze/applications/kchmviewer/debian/menu
+++ b/debian/_base/applications/kchmviewer/debian/menu
diff --git a/debian/squeeze/applications/kchmviewer/debian/patches/.gitignore b/debian/_base/applications/kchmviewer/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kchmviewer/debian/patches/.gitignore
+++ b/debian/_base/applications/kchmviewer/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/kchmviewer/debian/rules b/debian/_base/applications/kchmviewer/debian/rules
index 0fdbf1173..0fdbf1173 100755
--- a/debian/squeeze/applications/kchmviewer/debian/rules
+++ b/debian/_base/applications/kchmviewer/debian/rules
diff --git a/debian/squeeze/applications/kchmviewer/debian/source/format b/debian/_base/applications/kchmviewer/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kchmviewer/debian/source/format
+++ b/debian/_base/applications/kchmviewer/debian/source/format
diff --git a/debian/squeeze/applications/kchmviewer/debian/source/options b/debian/_base/applications/kchmviewer/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kchmviewer/debian/source/options
+++ b/debian/_base/applications/kchmviewer/debian/source/options
diff --git a/debian/squeeze/applications/kchmviewer/debian/watch b/debian/_base/applications/kchmviewer/debian/watch
index e55a5c924..e55a5c924 100644
--- a/debian/squeeze/applications/kchmviewer/debian/watch
+++ b/debian/_base/applications/kchmviewer/debian/watch
diff --git a/debian/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk b/debian/_base/applications/kcpuload/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kcpuload/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kcpuload/debian/cdbs/versions.pl b/debian/_base/applications/kcpuload/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kcpuload/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kcpuload/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kcpuload/debian/changelog b/debian/_base/applications/kcpuload/debian/changelog
index 16264ec9d..16264ec9d 100644
--- a/debian/squeeze/applications/kcpuload/debian/changelog
+++ b/debian/_base/applications/kcpuload/debian/changelog
diff --git a/debian/squeeze/applications/kcpuload/debian/compat b/debian/_base/applications/kcpuload/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kcpuload/debian/compat
+++ b/debian/_base/applications/kcpuload/debian/compat
diff --git a/debian/squeeze/applications/kcpuload/debian/control b/debian/_base/applications/kcpuload/debian/control
index e29335e61..e29335e61 100644
--- a/debian/squeeze/applications/kcpuload/debian/control
+++ b/debian/_base/applications/kcpuload/debian/control
diff --git a/debian/squeeze/applications/kcpuload/debian/copyright b/debian/_base/applications/kcpuload/debian/copyright
index a5ee5d69c..a5ee5d69c 100644
--- a/debian/squeeze/applications/kcpuload/debian/copyright
+++ b/debian/_base/applications/kcpuload/debian/copyright
diff --git a/debian/squeeze/applications/kcpuload/debian/doc-base b/debian/_base/applications/kcpuload/debian/doc-base
index 59af0de31..59af0de31 100644
--- a/debian/squeeze/applications/kcpuload/debian/doc-base
+++ b/debian/_base/applications/kcpuload/debian/doc-base
diff --git a/debian/squeeze/applications/kcpuload/debian/docs b/debian/_base/applications/kcpuload/debian/docs
index 63c61960c..63c61960c 100644
--- a/debian/squeeze/applications/kcpuload/debian/docs
+++ b/debian/_base/applications/kcpuload/debian/docs
diff --git a/debian/squeeze/applications/kcpuload/debian/kcpuload.1 b/debian/_base/applications/kcpuload/debian/kcpuload.1
index 0eb630559..0eb630559 100644
--- a/debian/squeeze/applications/kcpuload/debian/kcpuload.1
+++ b/debian/_base/applications/kcpuload/debian/kcpuload.1
diff --git a/debian/squeeze/applications/kcpuload/debian/kcpuload.install b/debian/_base/applications/kcpuload/debian/kcpuload.install
index d3c2fb81c..d3c2fb81c 100644
--- a/debian/squeeze/applications/kcpuload/debian/kcpuload.install
+++ b/debian/_base/applications/kcpuload/debian/kcpuload.install
diff --git a/debian/squeeze/applications/kcpuload/debian/kcpuload.xpm b/debian/_base/applications/kcpuload/debian/kcpuload.xpm
index 3c49eab7e..3c49eab7e 100644
--- a/debian/squeeze/applications/kcpuload/debian/kcpuload.xpm
+++ b/debian/_base/applications/kcpuload/debian/kcpuload.xpm
diff --git a/debian/squeeze/applications/kcpuload/debian/links b/debian/_base/applications/kcpuload/debian/links
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kcpuload/debian/links
+++ b/debian/_base/applications/kcpuload/debian/links
diff --git a/debian/squeeze/applications/kcpuload/debian/menu b/debian/_base/applications/kcpuload/debian/menu
index 684348e2f..684348e2f 100644
--- a/debian/squeeze/applications/kcpuload/debian/menu
+++ b/debian/_base/applications/kcpuload/debian/menu
diff --git a/debian/squeeze/applications/kcpuload/debian/override b/debian/_base/applications/kcpuload/debian/override
index e3c6bcea4..e3c6bcea4 100644
--- a/debian/squeeze/applications/kcpuload/debian/override
+++ b/debian/_base/applications/kcpuload/debian/override
diff --git a/debian/squeeze/applications/kcpuload/debian/rules b/debian/_base/applications/kcpuload/debian/rules
index bc0e82531..bc0e82531 100755
--- a/debian/squeeze/applications/kcpuload/debian/rules
+++ b/debian/_base/applications/kcpuload/debian/rules
diff --git a/debian/squeeze/applications/kcpuload/debian/source.lintian-overrides b/debian/_base/applications/kcpuload/debian/source.lintian-overrides
index 417f308dc..417f308dc 100644
--- a/debian/squeeze/applications/kcpuload/debian/source.lintian-overrides
+++ b/debian/_base/applications/kcpuload/debian/source.lintian-overrides
diff --git a/debian/squeeze/applications/kcpuload/debian/source/format b/debian/_base/applications/kcpuload/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kcpuload/debian/source/format
+++ b/debian/_base/applications/kcpuload/debian/source/format
diff --git a/debian/squeeze/applications/kcpuload/debian/source/options b/debian/_base/applications/kcpuload/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kcpuload/debian/source/options
+++ b/debian/_base/applications/kcpuload/debian/source/options
diff --git a/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kdbg/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kdbg/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kdbg/debian/cdbs/kde.mk b/debian/_base/applications/kdbg/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kdbg/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kdbg/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kdbg/debian/cdbs/versions.pl b/debian/_base/applications/kdbg/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kdbg/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kdbg/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kdbg/debian/changelog b/debian/_base/applications/kdbg/debian/changelog
index 85cee798e..85cee798e 100644
--- a/debian/squeeze/applications/kdbg/debian/changelog
+++ b/debian/_base/applications/kdbg/debian/changelog
diff --git a/debian/squeeze/applications/kdbg/debian/compat b/debian/_base/applications/kdbg/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kdbg/debian/compat
+++ b/debian/_base/applications/kdbg/debian/compat
diff --git a/debian/squeeze/applications/kdbg/debian/control b/debian/_base/applications/kdbg/debian/control
index 656937dc2..656937dc2 100644
--- a/debian/squeeze/applications/kdbg/debian/control
+++ b/debian/_base/applications/kdbg/debian/control
diff --git a/debian/squeeze/applications/kdbg/debian/copyright b/debian/_base/applications/kdbg/debian/copyright
index ebf1e447c..ebf1e447c 100644
--- a/debian/squeeze/applications/kdbg/debian/copyright
+++ b/debian/_base/applications/kdbg/debian/copyright
diff --git a/debian/squeeze/applications/kdbg/debian/doc-base b/debian/_base/applications/kdbg/debian/doc-base
index 330debeb4..330debeb4 100644
--- a/debian/squeeze/applications/kdbg/debian/doc-base
+++ b/debian/_base/applications/kdbg/debian/doc-base
diff --git a/debian/squeeze/applications/kdbg/debian/docs b/debian/_base/applications/kdbg/debian/docs
index 2e58c4d34..2e58c4d34 100644
--- a/debian/squeeze/applications/kdbg/debian/docs
+++ b/debian/_base/applications/kdbg/debian/docs
diff --git a/debian/squeeze/applications/kdbg/debian/kdbg.1 b/debian/_base/applications/kdbg/debian/kdbg.1
index 588ef94db..588ef94db 100644
--- a/debian/squeeze/applications/kdbg/debian/kdbg.1
+++ b/debian/_base/applications/kdbg/debian/kdbg.1
diff --git a/debian/squeeze/applications/kdbg/debian/kdbg.xpm b/debian/_base/applications/kdbg/debian/kdbg.xpm
index 8df7ac5f7..8df7ac5f7 100644
--- a/debian/squeeze/applications/kdbg/debian/kdbg.xpm
+++ b/debian/_base/applications/kdbg/debian/kdbg.xpm
diff --git a/debian/squeeze/applications/kdbg/debian/menu b/debian/_base/applications/kdbg/debian/menu
index d3a882bd0..d3a882bd0 100644
--- a/debian/squeeze/applications/kdbg/debian/menu
+++ b/debian/_base/applications/kdbg/debian/menu
diff --git a/debian/squeeze/applications/kdbg/debian/rules b/debian/_base/applications/kdbg/debian/rules
index 17bbc9b77..17bbc9b77 100755
--- a/debian/squeeze/applications/kdbg/debian/rules
+++ b/debian/_base/applications/kdbg/debian/rules
diff --git a/debian/squeeze/applications/kdbg/debian/source/format b/debian/_base/applications/kdbg/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kdbg/debian/source/format
+++ b/debian/_base/applications/kdbg/debian/source/format
diff --git a/debian/squeeze/applications/kdbg/debian/source/options b/debian/_base/applications/kdbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kdbg/debian/source/options
+++ b/debian/_base/applications/kdbg/debian/source/options
diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk b/debian/_base/applications/kdbusnotification/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kdbusnotification/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/versions.pl b/debian/_base/applications/kdbusnotification/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kdbusnotification/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kdbusnotification/debian/changelog b/debian/_base/applications/kdbusnotification/debian/changelog
index d98ce4aba..d98ce4aba 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/changelog
+++ b/debian/_base/applications/kdbusnotification/debian/changelog
diff --git a/debian/squeeze/applications/kdbusnotification/debian/compat b/debian/_base/applications/kdbusnotification/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/compat
+++ b/debian/_base/applications/kdbusnotification/debian/compat
diff --git a/debian/squeeze/applications/kdbusnotification/debian/control b/debian/_base/applications/kdbusnotification/debian/control
index 343c566a3..343c566a3 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/control
+++ b/debian/_base/applications/kdbusnotification/debian/control
diff --git a/debian/squeeze/applications/kdbusnotification/debian/copyright b/debian/_base/applications/kdbusnotification/debian/copyright
index 760904ce9..760904ce9 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/copyright
+++ b/debian/_base/applications/kdbusnotification/debian/copyright
diff --git a/debian/squeeze/applications/kdbusnotification/debian/links b/debian/_base/applications/kdbusnotification/debian/links
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/links
+++ b/debian/_base/applications/kdbusnotification/debian/links
diff --git a/debian/squeeze/applications/kdbusnotification/debian/rules b/debian/_base/applications/kdbusnotification/debian/rules
index 2750f623d..2750f623d 100755
--- a/debian/squeeze/applications/kdbusnotification/debian/rules
+++ b/debian/_base/applications/kdbusnotification/debian/rules
diff --git a/debian/squeeze/applications/kdbusnotification/debian/source/format b/debian/_base/applications/kdbusnotification/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/source/format
+++ b/debian/_base/applications/kdbusnotification/debian/source/format
diff --git a/debian/squeeze/applications/kdbusnotification/debian/source/options b/debian/_base/applications/kdbusnotification/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/source/options
+++ b/debian/_base/applications/kdbusnotification/debian/source/options
diff --git a/debian/squeeze/applications/kde-guidance/debian/README.Debian b/debian/_base/applications/kde-guidance/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/squeeze/applications/kde-guidance/debian/README.Debian
+++ b/debian/_base/applications/kde-guidance/debian/README.Debian
diff --git a/debian/squeeze/applications/kde-guidance/debian/changelog b/debian/_base/applications/kde-guidance/debian/changelog
index fbd50fb8f..fbd50fb8f 100644
--- a/debian/squeeze/applications/kde-guidance/debian/changelog
+++ b/debian/_base/applications/kde-guidance/debian/changelog
diff --git a/debian/squeeze/applications/kde-guidance/debian/compat b/debian/_base/applications/kde-guidance/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kde-guidance/debian/compat
+++ b/debian/_base/applications/kde-guidance/debian/compat
diff --git a/debian/squeeze/applications/kde-guidance/debian/control b/debian/_base/applications/kde-guidance/debian/control
index 89838b959..89838b959 100644
--- a/debian/squeeze/applications/kde-guidance/debian/control
+++ b/debian/_base/applications/kde-guidance/debian/control
diff --git a/debian/squeeze/applications/kde-guidance/debian/copyright b/debian/_base/applications/kde-guidance/debian/copyright
index 38c1d30e8..38c1d30e8 100644
--- a/debian/squeeze/applications/kde-guidance/debian/copyright
+++ b/debian/_base/applications/kde-guidance/debian/copyright
diff --git a/debian/squeeze/applications/kde-guidance/debian/dirs b/debian/_base/applications/kde-guidance/debian/dirs
index 3dd0bc793..3dd0bc793 100644
--- a/debian/squeeze/applications/kde-guidance/debian/dirs
+++ b/debian/_base/applications/kde-guidance/debian/dirs
diff --git a/debian/squeeze/applications/kde-guidance/debian/displayconfig-trinity.1 b/debian/_base/applications/kde-guidance/debian/displayconfig-trinity.1
index 3670902b8..3670902b8 100644
--- a/debian/squeeze/applications/kde-guidance/debian/displayconfig-trinity.1
+++ b/debian/_base/applications/kde-guidance/debian/displayconfig-trinity.1
diff --git a/debian/squeeze/applications/kde-guidance/debian/docs b/debian/_base/applications/kde-guidance/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/kde-guidance/debian/docs
+++ b/debian/_base/applications/kde-guidance/debian/docs
diff --git a/debian/squeeze/applications/kde-guidance/debian/guidance-backends-trinity.install b/debian/_base/applications/kde-guidance/debian/guidance-backends-trinity.install
index de6cbc63e..de6cbc63e 100644
--- a/debian/squeeze/applications/kde-guidance/debian/guidance-backends-trinity.install
+++ b/debian/_base/applications/kde-guidance/debian/guidance-backends-trinity.install
diff --git a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install b/debian/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
index 8c707520e..8c707520e 100644
--- a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
+++ b/debian/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
diff --git a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.init b/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.init
index 30a3854d1..30a3854d1 100644
--- a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.init
+++ b/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.init
diff --git a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install b/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.install
index ddf96826a..ddf96826a 100644
--- a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.install
+++ b/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.install
diff --git a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides b/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
index 6131946c2..6131946c2 100644
--- a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
+++ b/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
diff --git a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.postinst b/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst
index de2804fc4..de2804fc4 100644
--- a/debian/squeeze/applications/kde-guidance/debian/kde-guidance-trinity.postinst
+++ b/debian/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst
diff --git a/debian/squeeze/applications/kde-guidance/debian/mountconfig-trinity.1 b/debian/_base/applications/kde-guidance/debian/mountconfig-trinity.1
index 7f1fb728c..7f1fb728c 100644
--- a/debian/squeeze/applications/kde-guidance/debian/mountconfig-trinity.1
+++ b/debian/_base/applications/kde-guidance/debian/mountconfig-trinity.1
diff --git a/debian/squeeze/applications/kde-guidance/debian/patches/series b/debian/_base/applications/kde-guidance/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-guidance/debian/patches/series
+++ b/debian/_base/applications/kde-guidance/debian/patches/series
diff --git a/debian/squeeze/applications/kde-guidance/debian/pycompat b/debian/_base/applications/kde-guidance/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/debian/squeeze/applications/kde-guidance/debian/pycompat
+++ b/debian/_base/applications/kde-guidance/debian/pycompat
diff --git a/debian/squeeze/applications/kde-guidance/debian/python-distutils-jaunty.mk b/debian/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk
index db329306c..db329306c 100644
--- a/debian/squeeze/applications/kde-guidance/debian/python-distutils-jaunty.mk
+++ b/debian/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk
diff --git a/debian/squeeze/applications/kde-guidance/debian/pyversions b/debian/_base/applications/kde-guidance/debian/pyversions
index 0c043f18c..0c043f18c 100644
--- a/debian/squeeze/applications/kde-guidance/debian/pyversions
+++ b/debian/_base/applications/kde-guidance/debian/pyversions
diff --git a/debian/squeeze/applications/kde-guidance/debian/rules b/debian/_base/applications/kde-guidance/debian/rules
index 48e5e31d7..48e5e31d7 100755
--- a/debian/squeeze/applications/kde-guidance/debian/rules
+++ b/debian/_base/applications/kde-guidance/debian/rules
diff --git a/debian/squeeze/applications/kde-guidance/debian/serviceconfig-trinity.1 b/debian/_base/applications/kde-guidance/debian/serviceconfig-trinity.1
index 776a01998..776a01998 100644
--- a/debian/squeeze/applications/kde-guidance/debian/serviceconfig-trinity.1
+++ b/debian/_base/applications/kde-guidance/debian/serviceconfig-trinity.1
diff --git a/debian/squeeze/applications/kde-guidance/debian/source/format b/debian/_base/applications/kde-guidance/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kde-guidance/debian/source/format
+++ b/debian/_base/applications/kde-guidance/debian/source/format
diff --git a/debian/squeeze/applications/kde-guidance/debian/source/options b/debian/_base/applications/kde-guidance/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kde-guidance/debian/source/options
+++ b/debian/_base/applications/kde-guidance/debian/source/options
diff --git a/debian/squeeze/applications/kde-guidance/debian/userconfig-trinity.1 b/debian/_base/applications/kde-guidance/debian/userconfig-trinity.1
index 3b950add1..3b950add1 100644
--- a/debian/squeeze/applications/kde-guidance/debian/userconfig-trinity.1
+++ b/debian/_base/applications/kde-guidance/debian/userconfig-trinity.1
diff --git a/debian/squeeze/applications/kde-guidance/debian/watch b/debian/_base/applications/kde-guidance/debian/watch
index 19912c171..19912c171 100644
--- a/debian/squeeze/applications/kde-guidance/debian/watch
+++ b/debian/_base/applications/kde-guidance/debian/watch
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/changelog b/debian/_base/applications/kde-style-lipstik/debian/changelog
index 8df3a0424..8df3a0424 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/changelog
+++ b/debian/_base/applications/kde-style-lipstik/debian/changelog
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/compat b/debian/_base/applications/kde-style-lipstik/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/compat
+++ b/debian/_base/applications/kde-style-lipstik/debian/compat
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/control b/debian/_base/applications/kde-style-lipstik/debian/control
index 6bf98b714..6bf98b714 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/control
+++ b/debian/_base/applications/kde-style-lipstik/debian/control
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/copyright b/debian/_base/applications/kde-style-lipstik/debian/copyright
index 446318fca..446318fca 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/copyright
+++ b/debian/_base/applications/kde-style-lipstik/debian/copyright
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/dirs b/debian/_base/applications/kde-style-lipstik/debian/dirs
index 43e7f554c..43e7f554c 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/dirs
+++ b/debian/_base/applications/kde-style-lipstik/debian/dirs
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/docs b/debian/_base/applications/kde-style-lipstik/debian/docs
index 0948b8ef4..0948b8ef4 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/docs
+++ b/debian/_base/applications/kde-style-lipstik/debian/docs
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/patches/.gitignore b/debian/_base/applications/kde-style-lipstik/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/patches/.gitignore
+++ b/debian/_base/applications/kde-style-lipstik/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/rules b/debian/_base/applications/kde-style-lipstik/debian/rules
index 620265e8e..620265e8e 100755
--- a/debian/squeeze/applications/kde-style-lipstik/debian/rules
+++ b/debian/_base/applications/kde-style-lipstik/debian/rules
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/source/format b/debian/_base/applications/kde-style-lipstik/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/source/format
+++ b/debian/_base/applications/kde-style-lipstik/debian/source/format
diff --git a/debian/squeeze/applications/kde-style-lipstik/debian/source/options b/debian/_base/applications/kde-style-lipstik/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kde-style-lipstik/debian/source/options
+++ b/debian/_base/applications/kde-style-lipstik/debian/source/options
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/cdbs/kde.mk b/debian/_base/applications/kde-style-qtcurve/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kde-style-qtcurve/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/cdbs/versions.pl b/debian/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/changelog b/debian/_base/applications/kde-style-qtcurve/debian/changelog
index b89b8bc90..b89b8bc90 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/changelog
+++ b/debian/_base/applications/kde-style-qtcurve/debian/changelog
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/compat b/debian/_base/applications/kde-style-qtcurve/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/compat
+++ b/debian/_base/applications/kde-style-qtcurve/debian/compat
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/control b/debian/_base/applications/kde-style-qtcurve/debian/control
index 3f4b12a02..3f4b12a02 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/control
+++ b/debian/_base/applications/kde-style-qtcurve/debian/control
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/copyright b/debian/_base/applications/kde-style-qtcurve/debian/copyright
index 055d8a659..055d8a659 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/copyright
+++ b/debian/_base/applications/kde-style-qtcurve/debian/copyright
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/docs b/debian/_base/applications/kde-style-qtcurve/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/docs
+++ b/debian/_base/applications/kde-style-qtcurve/debian/docs
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install b/debian/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
index 003761370..003761370 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
+++ b/debian/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/patches/series b/debian/_base/applications/kde-style-qtcurve/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/patches/series
+++ b/debian/_base/applications/kde-style-qtcurve/debian/patches/series
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/rules b/debian/_base/applications/kde-style-qtcurve/debian/rules
index 52bf17ae4..52bf17ae4 100755
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/rules
+++ b/debian/_base/applications/kde-style-qtcurve/debian/rules
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/scan-version b/debian/_base/applications/kde-style-qtcurve/debian/scan-version
index 640ea27c7..640ea27c7 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/scan-version
+++ b/debian/_base/applications/kde-style-qtcurve/debian/scan-version
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/source/format b/debian/_base/applications/kde-style-qtcurve/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/source/format
+++ b/debian/_base/applications/kde-style-qtcurve/debian/source/format
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/source/options b/debian/_base/applications/kde-style-qtcurve/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/source/options
+++ b/debian/_base/applications/kde-style-qtcurve/debian/source/options
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/cdbs/kde.mk b/debian/_base/applications/kde-systemsettings/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kde-systemsettings/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/cdbs/versions.pl b/debian/_base/applications/kde-systemsettings/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kde-systemsettings/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/changelog b/debian/_base/applications/kde-systemsettings/debian/changelog
index 932e17449..932e17449 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/changelog
+++ b/debian/_base/applications/kde-systemsettings/debian/changelog
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/compat b/debian/_base/applications/kde-systemsettings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/compat
+++ b/debian/_base/applications/kde-systemsettings/debian/compat
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/control b/debian/_base/applications/kde-systemsettings/debian/control
index b1d4eec0a..b1d4eec0a 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/control
+++ b/debian/_base/applications/kde-systemsettings/debian/control
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/copyright b/debian/_base/applications/kde-systemsettings/debian/copyright
index 04a4bdce1..04a4bdce1 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/copyright
+++ b/debian/_base/applications/kde-systemsettings/debian/copyright
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/docs b/debian/_base/applications/kde-systemsettings/debian/docs
index 0eb1e7d11..0eb1e7d11 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/docs
+++ b/debian/_base/applications/kde-systemsettings/debian/docs
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/kde-settings-laptops.directory b/debian/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory
index 687a493c4..687a493c4 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/kde-settings-laptops.directory
+++ b/debian/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst b/debian/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
index f7b840ea2..f7b840ea2 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
+++ b/debian/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/patches/series b/debian/_base/applications/kde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/patches/series
+++ b/debian/_base/applications/kde-systemsettings/debian/patches/series
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/rules b/debian/_base/applications/kde-systemsettings/debian/rules
index e1f09b5cc..e1f09b5cc 100755
--- a/debian/squeeze/applications/kde-systemsettings/debian/rules
+++ b/debian/_base/applications/kde-systemsettings/debian/rules
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/source/format b/debian/_base/applications/kde-systemsettings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/source/format
+++ b/debian/_base/applications/kde-systemsettings/debian/source/format
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/source/options b/debian/_base/applications/kde-systemsettings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/source/options
+++ b/debian/_base/applications/kde-systemsettings/debian/source/options
diff --git a/debian/squeeze/applications/kde-systemsettings/debian/systemsettings.1.docbook b/debian/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook
index 2b260e626..2b260e626 100644
--- a/debian/squeeze/applications/kde-systemsettings/debian/systemsettings.1.docbook
+++ b/debian/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook
diff --git a/debian/squeeze/applications/kdesudo/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kdesudo/debian/cdbs/kde.mk b/debian/_base/applications/kdesudo/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kdesudo/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kdesudo/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kdesudo/debian/cdbs/versions.pl b/debian/_base/applications/kdesudo/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kdesudo/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kdesudo/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kdesudo/debian/changelog b/debian/_base/applications/kdesudo/debian/changelog
index d245ff2e7..d245ff2e7 100644
--- a/debian/squeeze/applications/kdesudo/debian/changelog
+++ b/debian/_base/applications/kdesudo/debian/changelog
diff --git a/debian/squeeze/applications/kdesudo/debian/compat b/debian/_base/applications/kdesudo/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kdesudo/debian/compat
+++ b/debian/_base/applications/kdesudo/debian/compat
diff --git a/debian/squeeze/applications/kdesudo/debian/control b/debian/_base/applications/kdesudo/debian/control
index 267ec5d4f..267ec5d4f 100644
--- a/debian/squeeze/applications/kdesudo/debian/control
+++ b/debian/_base/applications/kdesudo/debian/control
diff --git a/debian/squeeze/applications/kdesudo/debian/copyright b/debian/_base/applications/kdesudo/debian/copyright
index 9cd32407b..9cd32407b 100644
--- a/debian/squeeze/applications/kdesudo/debian/copyright
+++ b/debian/_base/applications/kdesudo/debian/copyright
diff --git a/debian/squeeze/applications/kdesudo/debian/kdesudo-trinity.1.docbook b/debian/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook
index 0e1ba2b60..0e1ba2b60 100644
--- a/debian/squeeze/applications/kdesudo/debian/kdesudo-trinity.1.docbook
+++ b/debian/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook
diff --git a/debian/squeeze/applications/kdesudo/debian/links b/debian/_base/applications/kdesudo/debian/links
index c30adf9c1..c30adf9c1 100644
--- a/debian/squeeze/applications/kdesudo/debian/links
+++ b/debian/_base/applications/kdesudo/debian/links
diff --git a/debian/squeeze/applications/kdesudo/debian/patches/series b/debian/_base/applications/kdesudo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdesudo/debian/patches/series
+++ b/debian/_base/applications/kdesudo/debian/patches/series
diff --git a/debian/squeeze/applications/kdesudo/debian/postinst b/debian/_base/applications/kdesudo/debian/postinst
index 7ec0ace2f..7ec0ace2f 100644
--- a/debian/squeeze/applications/kdesudo/debian/postinst
+++ b/debian/_base/applications/kdesudo/debian/postinst
diff --git a/debian/squeeze/applications/kdesudo/debian/postrm b/debian/_base/applications/kdesudo/debian/postrm
index 526a8c60a..526a8c60a 100644
--- a/debian/squeeze/applications/kdesudo/debian/postrm
+++ b/debian/_base/applications/kdesudo/debian/postrm
diff --git a/debian/squeeze/applications/kdesudo/debian/preinst b/debian/_base/applications/kdesudo/debian/preinst
index 4ce843004..4ce843004 100644
--- a/debian/squeeze/applications/kdesudo/debian/preinst
+++ b/debian/_base/applications/kdesudo/debian/preinst
diff --git a/debian/squeeze/applications/kdesudo/debian/rules b/debian/_base/applications/kdesudo/debian/rules
index f5cd38f63..f5cd38f63 100755
--- a/debian/squeeze/applications/kdesudo/debian/rules
+++ b/debian/_base/applications/kdesudo/debian/rules
diff --git a/debian/squeeze/applications/kdesudo/debian/source/format b/debian/_base/applications/kdesudo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kdesudo/debian/source/format
+++ b/debian/_base/applications/kdesudo/debian/source/format
diff --git a/debian/squeeze/applications/kdesudo/debian/source/options b/debian/_base/applications/kdesudo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kdesudo/debian/source/options
+++ b/debian/_base/applications/kdesudo/debian/source/options
diff --git a/debian/squeeze/applications/kdesvn/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
index 5510d9d2a..5510d9d2a 100644
--- a/debian/squeeze/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kdesvn/debian/cdbs/kde.mk b/debian/_base/applications/kdesvn/debian/cdbs/kde.mk
index b8d83b930..b8d83b930 100644
--- a/debian/squeeze/applications/kdesvn/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kdesvn/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kdesvn/debian/cdbs/versions.pl b/debian/_base/applications/kdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/debian/squeeze/applications/kdesvn/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kdesvn/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kdesvn/debian/changelog b/debian/_base/applications/kdesvn/debian/changelog
index c3e74b6d9..c3e74b6d9 100644
--- a/debian/squeeze/applications/kdesvn/debian/changelog
+++ b/debian/_base/applications/kdesvn/debian/changelog
diff --git a/debian/squeeze/applications/kdesvn/debian/compat b/debian/_base/applications/kdesvn/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kdesvn/debian/compat
+++ b/debian/_base/applications/kdesvn/debian/compat
diff --git a/debian/squeeze/applications/kdesvn/debian/control b/debian/_base/applications/kdesvn/debian/control
index 460fa2e5c..460fa2e5c 100644
--- a/debian/squeeze/applications/kdesvn/debian/control
+++ b/debian/_base/applications/kdesvn/debian/control
diff --git a/debian/squeeze/applications/kdesvn/debian/copyright b/debian/_base/applications/kdesvn/debian/copyright
index a3d664a33..a3d664a33 100644
--- a/debian/squeeze/applications/kdesvn/debian/copyright
+++ b/debian/_base/applications/kdesvn/debian/copyright
diff --git a/debian/squeeze/applications/kdesvn/debian/docs b/debian/_base/applications/kdesvn/debian/docs
index ca0272abf..ca0272abf 100644
--- a/debian/squeeze/applications/kdesvn/debian/docs
+++ b/debian/_base/applications/kdesvn/debian/docs
diff --git a/debian/squeeze/applications/kdesvn/debian/icons/kdesvn.xpm b/debian/_base/applications/kdesvn/debian/icons/kdesvn.xpm
index d5e2abf6a..d5e2abf6a 100644
--- a/debian/squeeze/applications/kdesvn/debian/icons/kdesvn.xpm
+++ b/debian/_base/applications/kdesvn/debian/icons/kdesvn.xpm
diff --git a/debian/squeeze/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install b/debian/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
index 44c022ef7..44c022ef7 100644
--- a/debian/squeeze/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
+++ b/debian/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
diff --git a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install b/debian/_base/applications/kdesvn/debian/kdesvn-trinity.install
index 546d35034..546d35034 100644
--- a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install
+++ b/debian/_base/applications/kdesvn/debian/kdesvn-trinity.install
diff --git a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.manpages b/debian/_base/applications/kdesvn/debian/kdesvn-trinity.manpages
index c834c876c..c834c876c 100644
--- a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.manpages
+++ b/debian/_base/applications/kdesvn/debian/kdesvn-trinity.manpages
diff --git a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.menu b/debian/_base/applications/kdesvn/debian/kdesvn-trinity.menu
index c85d2665d..c85d2665d 100644
--- a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.menu
+++ b/debian/_base/applications/kdesvn/debian/kdesvn-trinity.menu
diff --git a/debian/squeeze/applications/kdesvn/debian/libsvnqt-trinity-dev.install b/debian/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install
index fb3c81018..fb3c81018 100644
--- a/debian/squeeze/applications/kdesvn/debian/libsvnqt-trinity-dev.install
+++ b/debian/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install
diff --git a/debian/squeeze/applications/kdesvn/debian/libsvnqt4-trinity.install b/debian/_base/applications/kdesvn/debian/libsvnqt4-trinity.install
index fcfe51754..fcfe51754 100644
--- a/debian/squeeze/applications/kdesvn/debian/libsvnqt4-trinity.install
+++ b/debian/_base/applications/kdesvn/debian/libsvnqt4-trinity.install
diff --git a/debian/squeeze/applications/kdesvn/debian/man/kdesvn.1 b/debian/_base/applications/kdesvn/debian/man/kdesvn.1
index 0e4816669..0e4816669 100644
--- a/debian/squeeze/applications/kdesvn/debian/man/kdesvn.1
+++ b/debian/_base/applications/kdesvn/debian/man/kdesvn.1
diff --git a/debian/squeeze/applications/kdesvn/debian/man/kdesvnaskpass.1 b/debian/_base/applications/kdesvn/debian/man/kdesvnaskpass.1
index 4cc8f03ad..4cc8f03ad 100644
--- a/debian/squeeze/applications/kdesvn/debian/man/kdesvnaskpass.1
+++ b/debian/_base/applications/kdesvn/debian/man/kdesvnaskpass.1
diff --git a/debian/squeeze/applications/kdesvn/debian/patches/series b/debian/_base/applications/kdesvn/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdesvn/debian/patches/series
+++ b/debian/_base/applications/kdesvn/debian/patches/series
diff --git a/debian/squeeze/applications/kdesvn/debian/rules b/debian/_base/applications/kdesvn/debian/rules
index 74c5fe7ec..74c5fe7ec 100755
--- a/debian/squeeze/applications/kdesvn/debian/rules
+++ b/debian/_base/applications/kdesvn/debian/rules
diff --git a/debian/squeeze/applications/kdesvn/debian/source/format b/debian/_base/applications/kdesvn/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kdesvn/debian/source/format
+++ b/debian/_base/applications/kdesvn/debian/source/format
diff --git a/debian/squeeze/applications/kdesvn/debian/source/options b/debian/_base/applications/kdesvn/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kdesvn/debian/source/options
+++ b/debian/_base/applications/kdesvn/debian/source/options
diff --git a/debian/squeeze/applications/kdesvn/debian/watch b/debian/_base/applications/kdesvn/debian/watch
index 190c9f8f7..190c9f8f7 100644
--- a/debian/squeeze/applications/kdesvn/debian/watch
+++ b/debian/_base/applications/kdesvn/debian/watch
diff --git a/debian/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk b/debian/_base/applications/kdiff3/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kdiff3/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kdiff3/debian/cdbs/versions.pl b/debian/_base/applications/kdiff3/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kdiff3/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kdiff3/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kdiff3/debian/changelog b/debian/_base/applications/kdiff3/debian/changelog
index f0215eada..f0215eada 100644
--- a/debian/squeeze/applications/kdiff3/debian/changelog
+++ b/debian/_base/applications/kdiff3/debian/changelog
diff --git a/debian/squeeze/applications/kdiff3/debian/compat b/debian/_base/applications/kdiff3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kdiff3/debian/compat
+++ b/debian/_base/applications/kdiff3/debian/compat
diff --git a/debian/squeeze/applications/kdiff3/debian/control b/debian/_base/applications/kdiff3/debian/control
index 4071b3065..4071b3065 100644
--- a/debian/squeeze/applications/kdiff3/debian/control
+++ b/debian/_base/applications/kdiff3/debian/control
diff --git a/debian/squeeze/applications/kdiff3/debian/copyright b/debian/_base/applications/kdiff3/debian/copyright
index 05b7204fd..05b7204fd 100644
--- a/debian/squeeze/applications/kdiff3/debian/copyright
+++ b/debian/_base/applications/kdiff3/debian/copyright
diff --git a/debian/squeeze/applications/kdiff3/debian/docs b/debian/_base/applications/kdiff3/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/applications/kdiff3/debian/docs
+++ b/debian/_base/applications/kdiff3/debian/docs
diff --git a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base b/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
index 014004a26..014004a26 100644
--- a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
+++ b/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
diff --git a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.install b/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install
index 6d9c9dd9a..6d9c9dd9a 100644
--- a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.install
+++ b/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.install
diff --git a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.links b/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links
index e3fbe7781..e3fbe7781 100644
--- a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity-doc.links
+++ b/debian/_base/applications/kdiff3/debian/kdiff3-trinity-doc.links
diff --git a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity.install b/debian/_base/applications/kdiff3/debian/kdiff3-trinity.install
index 00e22f353..00e22f353 100644
--- a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity.install
+++ b/debian/_base/applications/kdiff3/debian/kdiff3-trinity.install
diff --git a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity.sgml b/debian/_base/applications/kdiff3/debian/kdiff3-trinity.sgml
index 6eaa4064f..6eaa4064f 100644
--- a/debian/squeeze/applications/kdiff3/debian/kdiff3-trinity.sgml
+++ b/debian/_base/applications/kdiff3/debian/kdiff3-trinity.sgml
diff --git a/debian/squeeze/applications/kdiff3/debian/patches/.gitignore b/debian/_base/applications/kdiff3/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdiff3/debian/patches/.gitignore
+++ b/debian/_base/applications/kdiff3/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/kdiff3/debian/rules b/debian/_base/applications/kdiff3/debian/rules
index 9181b1148..9181b1148 100755
--- a/debian/squeeze/applications/kdiff3/debian/rules
+++ b/debian/_base/applications/kdiff3/debian/rules
diff --git a/debian/squeeze/applications/kdiff3/debian/source/format b/debian/_base/applications/kdiff3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kdiff3/debian/source/format
+++ b/debian/_base/applications/kdiff3/debian/source/format
diff --git a/debian/squeeze/applications/kdiff3/debian/source/options b/debian/_base/applications/kdiff3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kdiff3/debian/source/options
+++ b/debian/_base/applications/kdiff3/debian/source/options
diff --git a/debian/squeeze/applications/kdiff3/debian/watch b/debian/_base/applications/kdiff3/debian/watch
index 1f8b23456..1f8b23456 100644
--- a/debian/squeeze/applications/kdiff3/debian/watch
+++ b/debian/_base/applications/kdiff3/debian/watch
diff --git a/debian/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk b/debian/_base/applications/kdirstat/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kdirstat/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kdirstat/debian/cdbs/versions.pl b/debian/_base/applications/kdirstat/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kdirstat/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kdirstat/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kdirstat/debian/changelog b/debian/_base/applications/kdirstat/debian/changelog
index bf0c6d43b..bf0c6d43b 100644
--- a/debian/squeeze/applications/kdirstat/debian/changelog
+++ b/debian/_base/applications/kdirstat/debian/changelog
diff --git a/debian/squeeze/applications/kdirstat/debian/compat b/debian/_base/applications/kdirstat/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kdirstat/debian/compat
+++ b/debian/_base/applications/kdirstat/debian/compat
diff --git a/debian/squeeze/applications/kdirstat/debian/control b/debian/_base/applications/kdirstat/debian/control
index afda493ee..afda493ee 100644
--- a/debian/squeeze/applications/kdirstat/debian/control
+++ b/debian/_base/applications/kdirstat/debian/control
diff --git a/debian/squeeze/applications/kdirstat/debian/copyright b/debian/_base/applications/kdirstat/debian/copyright
index 5230f7951..5230f7951 100644
--- a/debian/squeeze/applications/kdirstat/debian/copyright
+++ b/debian/_base/applications/kdirstat/debian/copyright
diff --git a/debian/squeeze/applications/kdirstat/debian/kdirstat.1 b/debian/_base/applications/kdirstat/debian/kdirstat.1
index e58ff535c..e58ff535c 100644
--- a/debian/squeeze/applications/kdirstat/debian/kdirstat.1
+++ b/debian/_base/applications/kdirstat/debian/kdirstat.1
diff --git a/debian/squeeze/applications/kdirstat/debian/kdirstat.manpages b/debian/_base/applications/kdirstat/debian/kdirstat.manpages
index 3e4bf7ff8..3e4bf7ff8 100644
--- a/debian/squeeze/applications/kdirstat/debian/kdirstat.manpages
+++ b/debian/_base/applications/kdirstat/debian/kdirstat.manpages
diff --git a/debian/squeeze/applications/kdirstat/debian/patches/series b/debian/_base/applications/kdirstat/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdirstat/debian/patches/series
+++ b/debian/_base/applications/kdirstat/debian/patches/series
diff --git a/debian/squeeze/applications/kdirstat/debian/rules b/debian/_base/applications/kdirstat/debian/rules
index 1e16df51a..1e16df51a 100755
--- a/debian/squeeze/applications/kdirstat/debian/rules
+++ b/debian/_base/applications/kdirstat/debian/rules
diff --git a/debian/squeeze/applications/kdirstat/debian/source.lintian-overrides b/debian/_base/applications/kdirstat/debian/source.lintian-overrides
index aad24dd30..aad24dd30 100644
--- a/debian/squeeze/applications/kdirstat/debian/source.lintian-overrides
+++ b/debian/_base/applications/kdirstat/debian/source.lintian-overrides
diff --git a/debian/squeeze/applications/kdirstat/debian/source/format b/debian/_base/applications/kdirstat/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kdirstat/debian/source/format
+++ b/debian/_base/applications/kdirstat/debian/source/format
diff --git a/debian/squeeze/applications/kdirstat/debian/source/options b/debian/_base/applications/kdirstat/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kdirstat/debian/source/options
+++ b/debian/_base/applications/kdirstat/debian/source/options
diff --git a/debian/squeeze/applications/kdirstat/debian/watch b/debian/_base/applications/kdirstat/debian/watch
index 6dc72cf03..6dc72cf03 100644
--- a/debian/squeeze/applications/kdirstat/debian/watch
+++ b/debian/_base/applications/kdirstat/debian/watch
diff --git a/debian/squeeze/applications/kdmtheme/debian/README.Debian b/debian/_base/applications/kdmtheme/debian/README.Debian
index 1291b6a32..1291b6a32 100644
--- a/debian/squeeze/applications/kdmtheme/debian/README.Debian
+++ b/debian/_base/applications/kdmtheme/debian/README.Debian
diff --git a/debian/squeeze/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kdmtheme/debian/cdbs/kde.mk b/debian/_base/applications/kdmtheme/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kdmtheme/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kdmtheme/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kdmtheme/debian/cdbs/versions.pl b/debian/_base/applications/kdmtheme/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kdmtheme/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kdmtheme/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kdmtheme/debian/changelog b/debian/_base/applications/kdmtheme/debian/changelog
index e14e2952b..e14e2952b 100644
--- a/debian/squeeze/applications/kdmtheme/debian/changelog
+++ b/debian/_base/applications/kdmtheme/debian/changelog
diff --git a/debian/squeeze/applications/kdmtheme/debian/compat b/debian/_base/applications/kdmtheme/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kdmtheme/debian/compat
+++ b/debian/_base/applications/kdmtheme/debian/compat
diff --git a/debian/squeeze/applications/kdmtheme/debian/control b/debian/_base/applications/kdmtheme/debian/control
index 9be4637d9..9be4637d9 100644
--- a/debian/squeeze/applications/kdmtheme/debian/control
+++ b/debian/_base/applications/kdmtheme/debian/control
diff --git a/debian/squeeze/applications/kdmtheme/debian/copyright b/debian/_base/applications/kdmtheme/debian/copyright
index 23265e2b6..23265e2b6 100644
--- a/debian/squeeze/applications/kdmtheme/debian/copyright
+++ b/debian/_base/applications/kdmtheme/debian/copyright
diff --git a/debian/squeeze/applications/kdmtheme/debian/docs b/debian/_base/applications/kdmtheme/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/applications/kdmtheme/debian/docs
+++ b/debian/_base/applications/kdmtheme/debian/docs
diff --git a/debian/squeeze/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/debian/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides
index d033183c7..d033183c7 100644
--- a/debian/squeeze/applications/kdmtheme/debian/kdmtheme.lintian-overrides
+++ b/debian/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides
diff --git a/debian/squeeze/applications/kdmtheme/debian/patches/.gitignore b/debian/_base/applications/kdmtheme/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdmtheme/debian/patches/.gitignore
+++ b/debian/_base/applications/kdmtheme/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/kdmtheme/debian/rules b/debian/_base/applications/kdmtheme/debian/rules
index b8b31a90b..b8b31a90b 100755
--- a/debian/squeeze/applications/kdmtheme/debian/rules
+++ b/debian/_base/applications/kdmtheme/debian/rules
diff --git a/debian/squeeze/applications/kdmtheme/debian/source/format b/debian/_base/applications/kdmtheme/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kdmtheme/debian/source/format
+++ b/debian/_base/applications/kdmtheme/debian/source/format
diff --git a/debian/squeeze/applications/kdmtheme/debian/source/options b/debian/_base/applications/kdmtheme/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kdmtheme/debian/source/options
+++ b/debian/_base/applications/kdmtheme/debian/source/options
diff --git a/debian/squeeze/applications/kdmtheme/debian/watch b/debian/_base/applications/kdmtheme/debian/watch
index 5cf8d8c80..5cf8d8c80 100644
--- a/debian/squeeze/applications/kdmtheme/debian/watch
+++ b/debian/_base/applications/kdmtheme/debian/watch
diff --git a/debian/squeeze/applications/kdpkg/debian/changelog b/debian/_base/applications/kdpkg/debian/changelog
index 2c3e7dd4d..2c3e7dd4d 100644
--- a/debian/squeeze/applications/kdpkg/debian/changelog
+++ b/debian/_base/applications/kdpkg/debian/changelog
diff --git a/debian/squeeze/applications/kdpkg/debian/compat b/debian/_base/applications/kdpkg/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kdpkg/debian/compat
+++ b/debian/_base/applications/kdpkg/debian/compat
diff --git a/debian/squeeze/applications/kdpkg/debian/control b/debian/_base/applications/kdpkg/debian/control
index 3ab929238..3ab929238 100644
--- a/debian/squeeze/applications/kdpkg/debian/control
+++ b/debian/_base/applications/kdpkg/debian/control
diff --git a/debian/squeeze/applications/kdpkg/debian/copyright b/debian/_base/applications/kdpkg/debian/copyright
index 6ca73edad..6ca73edad 100644
--- a/debian/squeeze/applications/kdpkg/debian/copyright
+++ b/debian/_base/applications/kdpkg/debian/copyright
diff --git a/debian/squeeze/applications/kdpkg/debian/kdpkg-install.1 b/debian/_base/applications/kdpkg/debian/kdpkg-install.1
index 0325170a5..0325170a5 100644
--- a/debian/squeeze/applications/kdpkg/debian/kdpkg-install.1
+++ b/debian/_base/applications/kdpkg/debian/kdpkg-install.1
diff --git a/debian/squeeze/applications/kdpkg/debian/kdpkg.1 b/debian/_base/applications/kdpkg/debian/kdpkg.1
index 0325170a5..0325170a5 100644
--- a/debian/squeeze/applications/kdpkg/debian/kdpkg.1
+++ b/debian/_base/applications/kdpkg/debian/kdpkg.1
diff --git a/debian/squeeze/applications/kdpkg/debian/manpages b/debian/_base/applications/kdpkg/debian/manpages
index 7835ccb72..7835ccb72 100644
--- a/debian/squeeze/applications/kdpkg/debian/manpages
+++ b/debian/_base/applications/kdpkg/debian/manpages
diff --git a/debian/squeeze/applications/kdpkg/debian/patches/series b/debian/_base/applications/kdpkg/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kdpkg/debian/patches/series
+++ b/debian/_base/applications/kdpkg/debian/patches/series
diff --git a/debian/squeeze/applications/kdpkg/debian/rules b/debian/_base/applications/kdpkg/debian/rules
index 8293bfe64..8293bfe64 100755
--- a/debian/squeeze/applications/kdpkg/debian/rules
+++ b/debian/_base/applications/kdpkg/debian/rules
diff --git a/debian/squeeze/applications/kdpkg/debian/source/format b/debian/_base/applications/kdpkg/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kdpkg/debian/source/format
+++ b/debian/_base/applications/kdpkg/debian/source/format
diff --git a/debian/squeeze/applications/kdpkg/debian/source/options b/debian/_base/applications/kdpkg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kdpkg/debian/source/options
+++ b/debian/_base/applications/kdpkg/debian/source/options
diff --git a/debian/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/keep/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/keep/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/keep/debian/cdbs/kde.mk b/debian/_base/applications/keep/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/keep/debian/cdbs/kde.mk
+++ b/debian/_base/applications/keep/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/keep/debian/cdbs/versions.pl b/debian/_base/applications/keep/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/keep/debian/cdbs/versions.pl
+++ b/debian/_base/applications/keep/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/keep/debian/changelog b/debian/_base/applications/keep/debian/changelog
index 4cbeb0449..4cbeb0449 100644
--- a/debian/squeeze/applications/keep/debian/changelog
+++ b/debian/_base/applications/keep/debian/changelog
diff --git a/debian/squeeze/applications/keep/debian/compat b/debian/_base/applications/keep/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/keep/debian/compat
+++ b/debian/_base/applications/keep/debian/compat
diff --git a/debian/squeeze/applications/keep/debian/control b/debian/_base/applications/keep/debian/control
index 40c489eb6..40c489eb6 100644
--- a/debian/squeeze/applications/keep/debian/control
+++ b/debian/_base/applications/keep/debian/control
diff --git a/debian/squeeze/applications/keep/debian/copyright b/debian/_base/applications/keep/debian/copyright
index ee2494fd8..ee2494fd8 100644
--- a/debian/squeeze/applications/keep/debian/copyright
+++ b/debian/_base/applications/keep/debian/copyright
diff --git a/debian/squeeze/applications/keep/debian/docs b/debian/_base/applications/keep/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/keep/debian/docs
+++ b/debian/_base/applications/keep/debian/docs
diff --git a/debian/squeeze/applications/keep/debian/keep.xml b/debian/_base/applications/keep/debian/keep.xml
index 31432279d..31432279d 100644
--- a/debian/squeeze/applications/keep/debian/keep.xml
+++ b/debian/_base/applications/keep/debian/keep.xml
diff --git a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
index 55238c41a..55238c41a 100644
--- a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/applications/keep/debian/patches/series b/debian/_base/applications/keep/debian/patches/series
index 9ccf4a125..9ccf4a125 100644
--- a/debian/squeeze/applications/keep/debian/patches/series
+++ b/debian/_base/applications/keep/debian/patches/series
diff --git a/debian/squeeze/applications/keep/debian/rules b/debian/_base/applications/keep/debian/rules
index e2718e364..e2718e364 100755
--- a/debian/squeeze/applications/keep/debian/rules
+++ b/debian/_base/applications/keep/debian/rules
diff --git a/debian/squeeze/applications/keep/debian/source/format b/debian/_base/applications/keep/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/keep/debian/source/format
+++ b/debian/_base/applications/keep/debian/source/format
diff --git a/debian/squeeze/applications/keep/debian/source/options b/debian/_base/applications/keep/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/keep/debian/source/options
+++ b/debian/_base/applications/keep/debian/source/options
diff --git a/debian/squeeze/applications/keep/debian/watch b/debian/_base/applications/keep/debian/watch
index db207d2d8..db207d2d8 100644
--- a/debian/squeeze/applications/keep/debian/watch
+++ b/debian/_base/applications/keep/debian/watch
diff --git a/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kerry/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kerry/debian/cdbs/kde.mk b/debian/_base/applications/kerry/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kerry/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kerry/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kerry/debian/cdbs/versions.pl b/debian/_base/applications/kerry/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kerry/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kerry/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kerry/debian/changelog b/debian/_base/applications/kerry/debian/changelog
index 3f36fe40e..3f36fe40e 100644
--- a/debian/squeeze/applications/kerry/debian/changelog
+++ b/debian/_base/applications/kerry/debian/changelog
diff --git a/debian/squeeze/applications/kerry/debian/compat b/debian/_base/applications/kerry/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kerry/debian/compat
+++ b/debian/_base/applications/kerry/debian/compat
diff --git a/debian/squeeze/applications/kerry/debian/control b/debian/_base/applications/kerry/debian/control
index 009796741..009796741 100644
--- a/debian/squeeze/applications/kerry/debian/control
+++ b/debian/_base/applications/kerry/debian/control
diff --git a/debian/squeeze/applications/kerry/debian/copyright b/debian/_base/applications/kerry/debian/copyright
index 96a9180c9..96a9180c9 100644
--- a/debian/squeeze/applications/kerry/debian/copyright
+++ b/debian/_base/applications/kerry/debian/copyright
diff --git a/debian/squeeze/applications/kerry/debian/kerry.1.docbook b/debian/_base/applications/kerry/debian/kerry.1.docbook
index 49eb68460..49eb68460 100644
--- a/debian/squeeze/applications/kerry/debian/kerry.1.docbook
+++ b/debian/_base/applications/kerry/debian/kerry.1.docbook
diff --git a/debian/squeeze/applications/kerry/debian/patches/series b/debian/_base/applications/kerry/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kerry/debian/patches/series
+++ b/debian/_base/applications/kerry/debian/patches/series
diff --git a/debian/squeeze/applications/kerry/debian/postinst b/debian/_base/applications/kerry/debian/postinst
index 98c4063a3..98c4063a3 100644
--- a/debian/squeeze/applications/kerry/debian/postinst
+++ b/debian/_base/applications/kerry/debian/postinst
diff --git a/debian/squeeze/applications/kerry/debian/postrm b/debian/_base/applications/kerry/debian/postrm
index d1ae3b96c..d1ae3b96c 100644
--- a/debian/squeeze/applications/kerry/debian/postrm
+++ b/debian/_base/applications/kerry/debian/postrm
diff --git a/debian/squeeze/applications/kerry/debian/rules b/debian/_base/applications/kerry/debian/rules
index d86250261..d86250261 100755
--- a/debian/squeeze/applications/kerry/debian/rules
+++ b/debian/_base/applications/kerry/debian/rules
diff --git a/debian/squeeze/applications/kerry/debian/source/format b/debian/_base/applications/kerry/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kerry/debian/source/format
+++ b/debian/_base/applications/kerry/debian/source/format
diff --git a/debian/squeeze/applications/kerry/debian/source/options b/debian/_base/applications/kerry/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kerry/debian/source/options
+++ b/debian/_base/applications/kerry/debian/source/options
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/kde.mk b/debian/_base/applications/kgtk-qt3/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kgtk-qt3/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/versions.pl b/debian/_base/applications/kgtk-qt3/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kgtk-qt3/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/changelog b/debian/_base/applications/kgtk-qt3/debian/changelog
index e2c2e4920..e2c2e4920 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/changelog
+++ b/debian/_base/applications/kgtk-qt3/debian/changelog
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/compat b/debian/_base/applications/kgtk-qt3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/compat
+++ b/debian/_base/applications/kgtk-qt3/debian/compat
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/control b/debian/_base/applications/kgtk-qt3/debian/control
index df1033403..df1033403 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/control
+++ b/debian/_base/applications/kgtk-qt3/debian/control
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/copyright b/debian/_base/applications/kgtk-qt3/debian/copyright
index 0e93ef880..0e93ef880 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/copyright
+++ b/debian/_base/applications/kgtk-qt3/debian/copyright
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/debian/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
index f7e4ea7f5..f7e4ea7f5 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
+++ b/debian/_base/applications/kgtk-qt3/debian/kgtk-qt3-trinity.lintian
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/patches/series b/debian/_base/applications/kgtk-qt3/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/patches/series
+++ b/debian/_base/applications/kgtk-qt3/debian/patches/series
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/preload b/debian/_base/applications/kgtk-qt3/debian/preload
index 9508902de..9508902de 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/preload
+++ b/debian/_base/applications/kgtk-qt3/debian/preload
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/rules b/debian/_base/applications/kgtk-qt3/debian/rules
index df246e2ae..df246e2ae 100755
--- a/debian/squeeze/applications/kgtk-qt3/debian/rules
+++ b/debian/_base/applications/kgtk-qt3/debian/rules
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/source/format b/debian/_base/applications/kgtk-qt3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/source/format
+++ b/debian/_base/applications/kgtk-qt3/debian/source/format
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/source/options b/debian/_base/applications/kgtk-qt3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/source/options
+++ b/debian/_base/applications/kgtk-qt3/debian/source/options
diff --git a/debian/squeeze/applications/kile/debian/README.Debian b/debian/_base/applications/kile/debian/README.Debian
index 8e55c77bc..8e55c77bc 100644
--- a/debian/squeeze/applications/kile/debian/README.Debian
+++ b/debian/_base/applications/kile/debian/README.Debian
diff --git a/debian/squeeze/applications/kile/debian/TODO.Debian b/debian/_base/applications/kile/debian/TODO.Debian
index bbfc0d8dd..bbfc0d8dd 100644
--- a/debian/squeeze/applications/kile/debian/TODO.Debian
+++ b/debian/_base/applications/kile/debian/TODO.Debian
diff --git a/debian/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kile/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kile/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kile/debian/cdbs/kde.mk b/debian/_base/applications/kile/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kile/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kile/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kile/debian/cdbs/versions.pl b/debian/_base/applications/kile/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kile/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kile/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kile/debian/changelog b/debian/_base/applications/kile/debian/changelog
index 5fc398065..5fc398065 100644
--- a/debian/squeeze/applications/kile/debian/changelog
+++ b/debian/_base/applications/kile/debian/changelog
diff --git a/debian/squeeze/applications/kile/debian/compat b/debian/_base/applications/kile/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kile/debian/compat
+++ b/debian/_base/applications/kile/debian/compat
diff --git a/debian/squeeze/applications/kile/debian/control b/debian/_base/applications/kile/debian/control
index 5ec2a9ffe..5ec2a9ffe 100644
--- a/debian/squeeze/applications/kile/debian/control
+++ b/debian/_base/applications/kile/debian/control
diff --git a/debian/squeeze/applications/kile/debian/copyright b/debian/_base/applications/kile/debian/copyright
index 513a8f2ca..513a8f2ca 100644
--- a/debian/squeeze/applications/kile/debian/copyright
+++ b/debian/_base/applications/kile/debian/copyright
diff --git a/debian/squeeze/applications/kile/debian/docs b/debian/_base/applications/kile/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/kile/debian/docs
+++ b/debian/_base/applications/kile/debian/docs
diff --git a/debian/squeeze/applications/kile/debian/kile-trinity.install b/debian/_base/applications/kile/debian/kile-trinity.install
index 3d82db5d5..3d82db5d5 100644
--- a/debian/squeeze/applications/kile/debian/kile-trinity.install
+++ b/debian/_base/applications/kile/debian/kile-trinity.install
diff --git a/debian/squeeze/applications/kile/debian/kile-trinity.links b/debian/_base/applications/kile/debian/kile-trinity.links
index ebafda14f..ebafda14f 100644
--- a/debian/squeeze/applications/kile/debian/kile-trinity.links
+++ b/debian/_base/applications/kile/debian/kile-trinity.links
diff --git a/debian/squeeze/applications/kile/debian/kile.1 b/debian/_base/applications/kile/debian/kile.1
index bbcde5836..bbcde5836 100644
--- a/debian/squeeze/applications/kile/debian/kile.1
+++ b/debian/_base/applications/kile/debian/kile.1
diff --git a/debian/squeeze/applications/kile/debian/kile.xpm b/debian/_base/applications/kile/debian/kile.xpm
index 408d2710b..408d2710b 100644
--- a/debian/squeeze/applications/kile/debian/kile.xpm
+++ b/debian/_base/applications/kile/debian/kile.xpm
diff --git a/debian/squeeze/applications/kile/debian/menu b/debian/_base/applications/kile/debian/menu
index 8ddf08ad7..8ddf08ad7 100644
--- a/debian/squeeze/applications/kile/debian/menu
+++ b/debian/_base/applications/kile/debian/menu
diff --git a/debian/squeeze/applications/kile/debian/patches/.gitignore b/debian/_base/applications/kile/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kile/debian/patches/.gitignore
+++ b/debian/_base/applications/kile/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/kile/debian/rules b/debian/_base/applications/kile/debian/rules
index c4115ba16..c4115ba16 100755
--- a/debian/squeeze/applications/kile/debian/rules
+++ b/debian/_base/applications/kile/debian/rules
diff --git a/debian/squeeze/applications/kile/debian/source/format b/debian/_base/applications/kile/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kile/debian/source/format
+++ b/debian/_base/applications/kile/debian/source/format
diff --git a/debian/squeeze/applications/kile/debian/source/options b/debian/_base/applications/kile/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kile/debian/source/options
+++ b/debian/_base/applications/kile/debian/source/options
diff --git a/debian/squeeze/applications/kile/debian/watch b/debian/_base/applications/kile/debian/watch
index e372a7062..e372a7062 100644
--- a/debian/squeeze/applications/kile/debian/watch
+++ b/debian/_base/applications/kile/debian/watch
diff --git a/debian/squeeze/applications/kima/debian/changelog b/debian/_base/applications/kima/debian/changelog
index 9cc006cef..9cc006cef 100644
--- a/debian/squeeze/applications/kima/debian/changelog
+++ b/debian/_base/applications/kima/debian/changelog
diff --git a/debian/squeeze/applications/kima/debian/compat b/debian/_base/applications/kima/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kima/debian/compat
+++ b/debian/_base/applications/kima/debian/compat
diff --git a/debian/squeeze/applications/kima/debian/control b/debian/_base/applications/kima/debian/control
index 1d77490fa..1d77490fa 100644
--- a/debian/squeeze/applications/kima/debian/control
+++ b/debian/_base/applications/kima/debian/control
diff --git a/debian/squeeze/applications/kima/debian/copyright b/debian/_base/applications/kima/debian/copyright
index 8facbcf30..8facbcf30 100644
--- a/debian/squeeze/applications/kima/debian/copyright
+++ b/debian/_base/applications/kima/debian/copyright
diff --git a/debian/squeeze/applications/kima/debian/rules b/debian/_base/applications/kima/debian/rules
index 27a3fe333..27a3fe333 100755
--- a/debian/squeeze/applications/kima/debian/rules
+++ b/debian/_base/applications/kima/debian/rules
diff --git a/debian/squeeze/applications/kima/debian/source/format b/debian/_base/applications/kima/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kima/debian/source/format
+++ b/debian/_base/applications/kima/debian/source/format
diff --git a/debian/squeeze/applications/kima/debian/source/options b/debian/_base/applications/kima/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kima/debian/source/options
+++ b/debian/_base/applications/kima/debian/source/options
diff --git a/debian/squeeze/applications/kio-apt/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk b/debian/_base/applications/kio-apt/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kio-apt/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kio-apt/debian/cdbs/versions.pl b/debian/_base/applications/kio-apt/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kio-apt/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kio-apt/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kio-apt/debian/changelog b/debian/_base/applications/kio-apt/debian/changelog
index 1b3d932c4..1b3d932c4 100644
--- a/debian/squeeze/applications/kio-apt/debian/changelog
+++ b/debian/_base/applications/kio-apt/debian/changelog
diff --git a/debian/squeeze/applications/kio-apt/debian/compat b/debian/_base/applications/kio-apt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kio-apt/debian/compat
+++ b/debian/_base/applications/kio-apt/debian/compat
diff --git a/debian/squeeze/applications/kio-apt/debian/control b/debian/_base/applications/kio-apt/debian/control
index d2bab27d8..d2bab27d8 100644
--- a/debian/squeeze/applications/kio-apt/debian/control
+++ b/debian/_base/applications/kio-apt/debian/control
diff --git a/debian/squeeze/applications/kio-apt/debian/copyright b/debian/_base/applications/kio-apt/debian/copyright
index b461d84ed..b461d84ed 100644
--- a/debian/squeeze/applications/kio-apt/debian/copyright
+++ b/debian/_base/applications/kio-apt/debian/copyright
diff --git a/debian/squeeze/applications/kio-apt/debian/docs b/debian/_base/applications/kio-apt/debian/docs
index 62deb0497..62deb0497 100644
--- a/debian/squeeze/applications/kio-apt/debian/docs
+++ b/debian/_base/applications/kio-apt/debian/docs
diff --git a/debian/squeeze/applications/kio-apt/debian/fixrpath b/debian/_base/applications/kio-apt/debian/fixrpath
index 0ca44359e..0ca44359e 100755
--- a/debian/squeeze/applications/kio-apt/debian/fixrpath
+++ b/debian/_base/applications/kio-apt/debian/fixrpath
diff --git a/debian/squeeze/applications/kio-apt/debian/kdedeb_logo.png.uu b/debian/_base/applications/kio-apt/debian/kdedeb_logo.png.uu
index 85ac9ca79..85ac9ca79 100644
--- a/debian/squeeze/applications/kio-apt/debian/kdedeb_logo.png.uu
+++ b/debian/_base/applications/kio-apt/debian/kdedeb_logo.png.uu
diff --git a/debian/squeeze/applications/kio-apt/debian/patches/series b/debian/_base/applications/kio-apt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kio-apt/debian/patches/series
+++ b/debian/_base/applications/kio-apt/debian/patches/series
diff --git a/debian/squeeze/applications/kio-apt/debian/rules b/debian/_base/applications/kio-apt/debian/rules
index db5da700b..db5da700b 100755
--- a/debian/squeeze/applications/kio-apt/debian/rules
+++ b/debian/_base/applications/kio-apt/debian/rules
diff --git a/debian/squeeze/applications/kio-apt/debian/source/format b/debian/_base/applications/kio-apt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kio-apt/debian/source/format
+++ b/debian/_base/applications/kio-apt/debian/source/format
diff --git a/debian/squeeze/applications/kio-apt/debian/source/options b/debian/_base/applications/kio-apt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kio-apt/debian/source/options
+++ b/debian/_base/applications/kio-apt/debian/source/options
diff --git a/debian/squeeze/applications/kio-locate/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/debian/squeeze/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kio-locate/debian/cdbs/kde.mk b/debian/_base/applications/kio-locate/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/kio-locate/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kio-locate/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kio-locate/debian/cdbs/versions.pl b/debian/_base/applications/kio-locate/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kio-locate/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kio-locate/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kio-locate/debian/changelog b/debian/_base/applications/kio-locate/debian/changelog
index 6fe22089e..6fe22089e 100644
--- a/debian/squeeze/applications/kio-locate/debian/changelog
+++ b/debian/_base/applications/kio-locate/debian/changelog
diff --git a/debian/squeeze/applications/kio-locate/debian/compat b/debian/_base/applications/kio-locate/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kio-locate/debian/compat
+++ b/debian/_base/applications/kio-locate/debian/compat
diff --git a/debian/squeeze/applications/kio-locate/debian/control b/debian/_base/applications/kio-locate/debian/control
index 53344d660..53344d660 100644
--- a/debian/squeeze/applications/kio-locate/debian/control
+++ b/debian/_base/applications/kio-locate/debian/control
diff --git a/debian/squeeze/applications/kio-locate/debian/copyright b/debian/_base/applications/kio-locate/debian/copyright
index 17e1fdc15..17e1fdc15 100644
--- a/debian/squeeze/applications/kio-locate/debian/copyright
+++ b/debian/_base/applications/kio-locate/debian/copyright
diff --git a/debian/squeeze/applications/kio-locate/debian/patches/series b/debian/_base/applications/kio-locate/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kio-locate/debian/patches/series
+++ b/debian/_base/applications/kio-locate/debian/patches/series
diff --git a/debian/squeeze/applications/kio-locate/debian/rules b/debian/_base/applications/kio-locate/debian/rules
index 09b22dcb0..09b22dcb0 100755
--- a/debian/squeeze/applications/kio-locate/debian/rules
+++ b/debian/_base/applications/kio-locate/debian/rules
diff --git a/debian/squeeze/applications/kio-locate/debian/source/format b/debian/_base/applications/kio-locate/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kio-locate/debian/source/format
+++ b/debian/_base/applications/kio-locate/debian/source/format
diff --git a/debian/squeeze/applications/kio-locate/debian/source/options b/debian/_base/applications/kio-locate/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kio-locate/debian/source/options
+++ b/debian/_base/applications/kio-locate/debian/source/options
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk b/debian/_base/applications/kio-umountwrapper/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kio-umountwrapper/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/versions.pl b/debian/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/changelog b/debian/_base/applications/kio-umountwrapper/debian/changelog
index 44969da09..44969da09 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/changelog
+++ b/debian/_base/applications/kio-umountwrapper/debian/changelog
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/compat b/debian/_base/applications/kio-umountwrapper/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/compat
+++ b/debian/_base/applications/kio-umountwrapper/debian/compat
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/control b/debian/_base/applications/kio-umountwrapper/debian/control
index 22ef0d26c..22ef0d26c 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/control
+++ b/debian/_base/applications/kio-umountwrapper/debian/control
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/copyright b/debian/_base/applications/kio-umountwrapper/debian/copyright
index 08e471ac6..08e471ac6 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/copyright
+++ b/debian/_base/applications/kio-umountwrapper/debian/copyright
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/media_safelyremove.desktop b/debian/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop
index 970caf8a5..970caf8a5 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/media_safelyremove.desktop
+++ b/debian/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/patches/series b/debian/_base/applications/kio-umountwrapper/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/patches/series
+++ b/debian/_base/applications/kio-umountwrapper/debian/patches/series
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/postrm b/debian/_base/applications/kio-umountwrapper/debian/postrm
index 2baeddc3e..2baeddc3e 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/postrm
+++ b/debian/_base/applications/kio-umountwrapper/debian/postrm
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/preinst b/debian/_base/applications/kio-umountwrapper/debian/preinst
index 78e02c765..78e02c765 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/preinst
+++ b/debian/_base/applications/kio-umountwrapper/debian/preinst
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/rules b/debian/_base/applications/kio-umountwrapper/debian/rules
index 4f91d9a74..4f91d9a74 100755
--- a/debian/squeeze/applications/kio-umountwrapper/debian/rules
+++ b/debian/_base/applications/kio-umountwrapper/debian/rules
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/source/format b/debian/_base/applications/kio-umountwrapper/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/source/format
+++ b/debian/_base/applications/kio-umountwrapper/debian/source/format
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/source/options b/debian/_base/applications/kio-umountwrapper/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/source/options
+++ b/debian/_base/applications/kio-umountwrapper/debian/source/options
diff --git a/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kiosktool/debian/cdbs/kde.mk b/debian/_base/applications/kiosktool/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kiosktool/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kiosktool/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kiosktool/debian/cdbs/versions.pl b/debian/_base/applications/kiosktool/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kiosktool/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kiosktool/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kiosktool/debian/changelog b/debian/_base/applications/kiosktool/debian/changelog
index a81e4659e..a81e4659e 100644
--- a/debian/squeeze/applications/kiosktool/debian/changelog
+++ b/debian/_base/applications/kiosktool/debian/changelog
diff --git a/debian/squeeze/applications/kiosktool/debian/compat b/debian/_base/applications/kiosktool/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kiosktool/debian/compat
+++ b/debian/_base/applications/kiosktool/debian/compat
diff --git a/debian/squeeze/applications/kiosktool/debian/control b/debian/_base/applications/kiosktool/debian/control
index 1005343c6..1005343c6 100644
--- a/debian/squeeze/applications/kiosktool/debian/control
+++ b/debian/_base/applications/kiosktool/debian/control
diff --git a/debian/squeeze/applications/kiosktool/debian/copyright b/debian/_base/applications/kiosktool/debian/copyright
index a88b1d8d2..a88b1d8d2 100644
--- a/debian/squeeze/applications/kiosktool/debian/copyright
+++ b/debian/_base/applications/kiosktool/debian/copyright
diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1 b/debian/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
index 62faad5d3..62faad5d3 100644
--- a/debian/squeeze/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
+++ b/debian/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1 b/debian/_base/applications/kiosktool/debian/kiosktool-trinity.1
index 08ba2ec80..08ba2ec80 100644
--- a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1
+++ b/debian/_base/applications/kiosktool/debian/kiosktool-trinity.1
diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages b/debian/_base/applications/kiosktool/debian/kiosktool-trinity.manpages
index 2d009e1db..2d009e1db 100644
--- a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages
+++ b/debian/_base/applications/kiosktool/debian/kiosktool-trinity.manpages
diff --git a/debian/squeeze/applications/kiosktool/debian/patches/series b/debian/_base/applications/kiosktool/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kiosktool/debian/patches/series
+++ b/debian/_base/applications/kiosktool/debian/patches/series
diff --git a/debian/squeeze/applications/kiosktool/debian/rules b/debian/_base/applications/kiosktool/debian/rules
index 677edd830..677edd830 100755
--- a/debian/squeeze/applications/kiosktool/debian/rules
+++ b/debian/_base/applications/kiosktool/debian/rules
diff --git a/debian/squeeze/applications/kiosktool/debian/source/format b/debian/_base/applications/kiosktool/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kiosktool/debian/source/format
+++ b/debian/_base/applications/kiosktool/debian/source/format
diff --git a/debian/squeeze/applications/kiosktool/debian/source/options b/debian/_base/applications/kiosktool/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kiosktool/debian/source/options
+++ b/debian/_base/applications/kiosktool/debian/source/options
diff --git a/debian/squeeze/applications/kmplayer/debian/README.Debian b/debian/_base/applications/kmplayer/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/squeeze/applications/kmplayer/debian/README.Debian
+++ b/debian/_base/applications/kmplayer/debian/README.Debian
diff --git a/debian/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk b/debian/_base/applications/kmplayer/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kmplayer/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kmplayer/debian/cdbs/versions.pl b/debian/_base/applications/kmplayer/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kmplayer/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kmplayer/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kmplayer/debian/changelog b/debian/_base/applications/kmplayer/debian/changelog
index 6084762a7..6084762a7 100644
--- a/debian/squeeze/applications/kmplayer/debian/changelog
+++ b/debian/_base/applications/kmplayer/debian/changelog
diff --git a/debian/squeeze/applications/kmplayer/debian/compat b/debian/_base/applications/kmplayer/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kmplayer/debian/compat
+++ b/debian/_base/applications/kmplayer/debian/compat
diff --git a/debian/squeeze/applications/kmplayer/debian/control b/debian/_base/applications/kmplayer/debian/control
index 9f49f5143..9f49f5143 100644
--- a/debian/squeeze/applications/kmplayer/debian/control
+++ b/debian/_base/applications/kmplayer/debian/control
diff --git a/debian/squeeze/applications/kmplayer/debian/copyright b/debian/_base/applications/kmplayer/debian/copyright
index 749b0db05..749b0db05 100644
--- a/debian/squeeze/applications/kmplayer/debian/copyright
+++ b/debian/_base/applications/kmplayer/debian/copyright
diff --git a/debian/squeeze/applications/kmplayer/debian/kmplayer-base-trinity.install b/debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
index 7e7f44aec..7e7f44aec 100644
--- a/debian/squeeze/applications/kmplayer/debian/kmplayer-base-trinity.install
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-base-trinity.install
diff --git a/debian/squeeze/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install b/debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
index 4590b56f4..4590b56f4 100644
--- a/debian/squeeze/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-konq-plugins-trinity.install
diff --git a/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity-doc.install b/debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
index 9b26532f3..9b26532f3 100644
--- a/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity-doc.install
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-trinity-doc.install
diff --git a/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install b/debian/_base/applications/kmplayer/debian/kmplayer-trinity.install
index 3c2a5f5ff..3c2a5f5ff 100644
--- a/debian/squeeze/applications/kmplayer/debian/kmplayer-trinity.install
+++ b/debian/_base/applications/kmplayer/debian/kmplayer-trinity.install
diff --git a/debian/squeeze/applications/kmplayer/debian/kmplayer.1.docbook b/debian/_base/applications/kmplayer/debian/kmplayer.1.docbook
index eda152760..eda152760 100644
--- a/debian/squeeze/applications/kmplayer/debian/kmplayer.1.docbook
+++ b/debian/_base/applications/kmplayer/debian/kmplayer.1.docbook
diff --git a/debian/squeeze/applications/kmplayer/debian/menu b/debian/_base/applications/kmplayer/debian/menu
index 444b60fb5..444b60fb5 100644
--- a/debian/squeeze/applications/kmplayer/debian/menu
+++ b/debian/_base/applications/kmplayer/debian/menu
diff --git a/debian/squeeze/applications/kmplayer/debian/patches/series b/debian/_base/applications/kmplayer/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kmplayer/debian/patches/series
+++ b/debian/_base/applications/kmplayer/debian/patches/series
diff --git a/debian/squeeze/applications/kmplayer/debian/rules b/debian/_base/applications/kmplayer/debian/rules
index 5327ea0ac..5327ea0ac 100755
--- a/debian/squeeze/applications/kmplayer/debian/rules
+++ b/debian/_base/applications/kmplayer/debian/rules
diff --git a/debian/squeeze/applications/kmplayer/debian/source/format b/debian/_base/applications/kmplayer/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kmplayer/debian/source/format
+++ b/debian/_base/applications/kmplayer/debian/source/format
diff --git a/debian/squeeze/applications/kmplayer/debian/source/options b/debian/_base/applications/kmplayer/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kmplayer/debian/source/options
+++ b/debian/_base/applications/kmplayer/debian/source/options
diff --git a/debian/squeeze/applications/kmplayer/debian/watch b/debian/_base/applications/kmplayer/debian/watch
index d809e2ca1..d809e2ca1 100644
--- a/debian/squeeze/applications/kmplayer/debian/watch
+++ b/debian/_base/applications/kmplayer/debian/watch
diff --git a/debian/squeeze/applications/kmyfirewall/debian/changelog b/debian/_base/applications/kmyfirewall/debian/changelog
index cfe55d3e4..cfe55d3e4 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/changelog
+++ b/debian/_base/applications/kmyfirewall/debian/changelog
diff --git a/debian/squeeze/applications/kmyfirewall/debian/compat b/debian/_base/applications/kmyfirewall/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/compat
+++ b/debian/_base/applications/kmyfirewall/debian/compat
diff --git a/debian/squeeze/applications/kmyfirewall/debian/control b/debian/_base/applications/kmyfirewall/debian/control
index f482a51d5..f482a51d5 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/control
+++ b/debian/_base/applications/kmyfirewall/debian/control
diff --git a/debian/squeeze/applications/kmyfirewall/debian/copyright b/debian/_base/applications/kmyfirewall/debian/copyright
index 8429d407e..8429d407e 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/copyright
+++ b/debian/_base/applications/kmyfirewall/debian/copyright
diff --git a/debian/squeeze/applications/kmyfirewall/debian/debiandirs b/debian/_base/applications/kmyfirewall/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/debiandirs
+++ b/debian/_base/applications/kmyfirewall/debian/debiandirs
diff --git a/debian/squeeze/applications/kmyfirewall/debian/dirs b/debian/_base/applications/kmyfirewall/debian/dirs
index f0312285e..f0312285e 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/dirs
+++ b/debian/_base/applications/kmyfirewall/debian/dirs
diff --git a/debian/squeeze/applications/kmyfirewall/debian/docs b/debian/_base/applications/kmyfirewall/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/docs
+++ b/debian/_base/applications/kmyfirewall/debian/docs
diff --git a/debian/squeeze/applications/kmyfirewall/debian/install b/debian/_base/applications/kmyfirewall/debian/install
index 3a28b6931..3a28b6931 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/install
+++ b/debian/_base/applications/kmyfirewall/debian/install
diff --git a/debian/squeeze/applications/kmyfirewall/debian/kmfinstallerplugin.desktop b/debian/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
index 77922f4b4..77922f4b4 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
+++ b/debian/_base/applications/kmyfirewall/debian/kmfinstallerplugin.desktop
diff --git a/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.1 b/debian/_base/applications/kmyfirewall/debian/kmyfirewall.1
index 31560bd7b..31560bd7b 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.1
+++ b/debian/_base/applications/kmyfirewall/debian/kmyfirewall.1
diff --git a/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.desktop b/debian/_base/applications/kmyfirewall/debian/kmyfirewall.desktop
index 379235132..379235132 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.desktop
+++ b/debian/_base/applications/kmyfirewall/debian/kmyfirewall.desktop
diff --git a/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.xpm b/debian/_base/applications/kmyfirewall/debian/kmyfirewall.xpm
index 3d58b81ff..3d58b81ff 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.xpm
+++ b/debian/_base/applications/kmyfirewall/debian/kmyfirewall.xpm
diff --git a/debian/squeeze/applications/kmyfirewall/debian/manpages b/debian/_base/applications/kmyfirewall/debian/manpages
index fab755280..fab755280 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/manpages
+++ b/debian/_base/applications/kmyfirewall/debian/manpages
diff --git a/debian/squeeze/applications/kmyfirewall/debian/menu b/debian/_base/applications/kmyfirewall/debian/menu
index 3d1feab6e..3d1feab6e 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/menu
+++ b/debian/_base/applications/kmyfirewall/debian/menu
diff --git a/debian/squeeze/applications/kmyfirewall/debian/rules b/debian/_base/applications/kmyfirewall/debian/rules
index d03f14f42..d03f14f42 100755
--- a/debian/squeeze/applications/kmyfirewall/debian/rules
+++ b/debian/_base/applications/kmyfirewall/debian/rules
diff --git a/debian/squeeze/applications/kmyfirewall/debian/source/format b/debian/_base/applications/kmyfirewall/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/source/format
+++ b/debian/_base/applications/kmyfirewall/debian/source/format
diff --git a/debian/squeeze/applications/kmyfirewall/debian/source/options b/debian/_base/applications/kmyfirewall/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/source/options
+++ b/debian/_base/applications/kmyfirewall/debian/source/options
diff --git a/debian/squeeze/applications/kmyfirewall/debian/watch b/debian/_base/applications/kmyfirewall/debian/watch
index 42dfe005b..42dfe005b 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/watch
+++ b/debian/_base/applications/kmyfirewall/debian/watch
diff --git a/debian/squeeze/applications/kmymoney/debian/NEWS b/debian/_base/applications/kmymoney/debian/NEWS
index a10bb6f91..a10bb6f91 100644
--- a/debian/squeeze/applications/kmymoney/debian/NEWS
+++ b/debian/_base/applications/kmymoney/debian/NEWS
diff --git a/debian/squeeze/applications/kmymoney/debian/README.source b/debian/_base/applications/kmymoney/debian/README.source
index 2a0f24655..2a0f24655 100644
--- a/debian/squeeze/applications/kmymoney/debian/README.source
+++ b/debian/_base/applications/kmymoney/debian/README.source
diff --git a/debian/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk b/debian/_base/applications/kmymoney/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kmymoney/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kmymoney/debian/cdbs/versions.pl b/debian/_base/applications/kmymoney/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kmymoney/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kmymoney/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kmymoney/debian/changelog b/debian/_base/applications/kmymoney/debian/changelog
index ff799841f..ff799841f 100644
--- a/debian/squeeze/applications/kmymoney/debian/changelog
+++ b/debian/_base/applications/kmymoney/debian/changelog
diff --git a/debian/squeeze/applications/kmymoney/debian/compat b/debian/_base/applications/kmymoney/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kmymoney/debian/compat
+++ b/debian/_base/applications/kmymoney/debian/compat
diff --git a/debian/squeeze/applications/kmymoney/debian/control b/debian/_base/applications/kmymoney/debian/control
index 156707ea3..156707ea3 100644
--- a/debian/squeeze/applications/kmymoney/debian/control
+++ b/debian/_base/applications/kmymoney/debian/control
diff --git a/debian/squeeze/applications/kmymoney/debian/copyright b/debian/_base/applications/kmymoney/debian/copyright
index 6ba1a0edf..6ba1a0edf 100644
--- a/debian/squeeze/applications/kmymoney/debian/copyright
+++ b/debian/_base/applications/kmymoney/debian/copyright
diff --git a/debian/squeeze/applications/kmymoney/debian/kmymoney2-common-trinity.install b/debian/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install
index f8c7e9a01..f8c7e9a01 100644
--- a/debian/squeeze/applications/kmymoney/debian/kmymoney2-common-trinity.install
+++ b/debian/_base/applications/kmymoney/debian/kmymoney2-common-trinity.install
diff --git a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install
index 4c3b73990..4c3b73990 100644
--- a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/debian/_base/applications/kmymoney/debian/kmymoney2-trinity-dev.install
diff --git a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity.docs b/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.docs
index cbc02b603..cbc02b603 100644
--- a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity.docs
+++ b/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.docs
diff --git a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity.install b/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.install
index 89ecca2de..89ecca2de 100644
--- a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity.install
+++ b/debian/_base/applications/kmymoney/debian/kmymoney2-trinity.install
diff --git a/debian/squeeze/applications/kmymoney/debian/kmymoney2.xpm b/debian/_base/applications/kmymoney/debian/kmymoney2.xpm
index 8bf0321d5..8bf0321d5 100644
--- a/debian/squeeze/applications/kmymoney/debian/kmymoney2.xpm
+++ b/debian/_base/applications/kmymoney/debian/kmymoney2.xpm
diff --git a/debian/squeeze/applications/kmymoney/debian/menu b/debian/_base/applications/kmymoney/debian/menu
index 3a6b25af8..3a6b25af8 100644
--- a/debian/squeeze/applications/kmymoney/debian/menu
+++ b/debian/_base/applications/kmymoney/debian/menu
diff --git a/debian/squeeze/applications/kmymoney/debian/patches/series b/debian/_base/applications/kmymoney/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kmymoney/debian/patches/series
+++ b/debian/_base/applications/kmymoney/debian/patches/series
diff --git a/debian/squeeze/applications/kmymoney/debian/rules b/debian/_base/applications/kmymoney/debian/rules
index 31b6f6332..31b6f6332 100755
--- a/debian/squeeze/applications/kmymoney/debian/rules
+++ b/debian/_base/applications/kmymoney/debian/rules
diff --git a/debian/squeeze/applications/kmymoney/debian/source/format b/debian/_base/applications/kmymoney/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kmymoney/debian/source/format
+++ b/debian/_base/applications/kmymoney/debian/source/format
diff --git a/debian/squeeze/applications/kmymoney/debian/source/options b/debian/_base/applications/kmymoney/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kmymoney/debian/source/options
+++ b/debian/_base/applications/kmymoney/debian/source/options
diff --git a/debian/squeeze/applications/kmymoney/debian/watch b/debian/_base/applications/kmymoney/debian/watch
index b80efc65c..b80efc65c 100644
--- a/debian/squeeze/applications/kmymoney/debian/watch
+++ b/debian/_base/applications/kmymoney/debian/watch
diff --git a/debian/squeeze/applications/knemo/debian/README.Debian b/debian/_base/applications/knemo/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/squeeze/applications/knemo/debian/README.Debian
+++ b/debian/_base/applications/knemo/debian/README.Debian
diff --git a/debian/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/knemo/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/knemo/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/knemo/debian/cdbs/kde.mk b/debian/_base/applications/knemo/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/knemo/debian/cdbs/kde.mk
+++ b/debian/_base/applications/knemo/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/knemo/debian/cdbs/versions.pl b/debian/_base/applications/knemo/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/knemo/debian/cdbs/versions.pl
+++ b/debian/_base/applications/knemo/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/knemo/debian/changelog b/debian/_base/applications/knemo/debian/changelog
index fe6f4765f..fe6f4765f 100644
--- a/debian/squeeze/applications/knemo/debian/changelog
+++ b/debian/_base/applications/knemo/debian/changelog
diff --git a/debian/squeeze/applications/knemo/debian/compat b/debian/_base/applications/knemo/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knemo/debian/compat
+++ b/debian/_base/applications/knemo/debian/compat
diff --git a/debian/squeeze/applications/knemo/debian/control b/debian/_base/applications/knemo/debian/control
index 6c77dcbc1..6c77dcbc1 100644
--- a/debian/squeeze/applications/knemo/debian/control
+++ b/debian/_base/applications/knemo/debian/control
diff --git a/debian/squeeze/applications/knemo/debian/copyright b/debian/_base/applications/knemo/debian/copyright
index 56f8c81f8..56f8c81f8 100644
--- a/debian/squeeze/applications/knemo/debian/copyright
+++ b/debian/_base/applications/knemo/debian/copyright
diff --git a/debian/squeeze/applications/knemo/debian/dirs b/debian/_base/applications/knemo/debian/dirs
index 57855aec4..57855aec4 100644
--- a/debian/squeeze/applications/knemo/debian/dirs
+++ b/debian/_base/applications/knemo/debian/dirs
diff --git a/debian/squeeze/applications/knemo/debian/patches/series b/debian/_base/applications/knemo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knemo/debian/patches/series
+++ b/debian/_base/applications/knemo/debian/patches/series
diff --git a/debian/squeeze/applications/knemo/debian/rules b/debian/_base/applications/knemo/debian/rules
index 3b66fe478..3b66fe478 100755
--- a/debian/squeeze/applications/knemo/debian/rules
+++ b/debian/_base/applications/knemo/debian/rules
diff --git a/debian/squeeze/applications/knemo/debian/source/format b/debian/_base/applications/knemo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/knemo/debian/source/format
+++ b/debian/_base/applications/knemo/debian/source/format
diff --git a/debian/squeeze/applications/knemo/debian/source/options b/debian/_base/applications/knemo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/knemo/debian/source/options
+++ b/debian/_base/applications/knemo/debian/source/options
diff --git a/debian/squeeze/applications/knetload/debian/changelog b/debian/_base/applications/knetload/debian/changelog
index f5456314d..f5456314d 100644
--- a/debian/squeeze/applications/knetload/debian/changelog
+++ b/debian/_base/applications/knetload/debian/changelog
diff --git a/debian/squeeze/applications/knetload/debian/compat b/debian/_base/applications/knetload/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knetload/debian/compat
+++ b/debian/_base/applications/knetload/debian/compat
diff --git a/debian/squeeze/applications/knetload/debian/control b/debian/_base/applications/knetload/debian/control
index 5bcb1fd81..5bcb1fd81 100644
--- a/debian/squeeze/applications/knetload/debian/control
+++ b/debian/_base/applications/knetload/debian/control
diff --git a/debian/squeeze/applications/knetload/debian/copyright b/debian/_base/applications/knetload/debian/copyright
index 7093501e6..7093501e6 100644
--- a/debian/squeeze/applications/knetload/debian/copyright
+++ b/debian/_base/applications/knetload/debian/copyright
diff --git a/debian/squeeze/applications/knetload/debian/dirs b/debian/_base/applications/knetload/debian/dirs
index 43e7f554c..43e7f554c 100644
--- a/debian/squeeze/applications/knetload/debian/dirs
+++ b/debian/_base/applications/knetload/debian/dirs
diff --git a/debian/squeeze/applications/knetload/debian/docs b/debian/_base/applications/knetload/debian/docs
index ca0272abf..ca0272abf 100644
--- a/debian/squeeze/applications/knetload/debian/docs
+++ b/debian/_base/applications/knetload/debian/docs
diff --git a/debian/squeeze/applications/knetload/debian/knetload-trinity.install b/debian/_base/applications/knetload/debian/knetload-trinity.install
index cdb14888d..cdb14888d 100644
--- a/debian/squeeze/applications/knetload/debian/knetload-trinity.install
+++ b/debian/_base/applications/knetload/debian/knetload-trinity.install
diff --git a/debian/squeeze/applications/knetload/debian/knetload-trinity.manpages b/debian/_base/applications/knetload/debian/knetload-trinity.manpages
index b0a6ac166..b0a6ac166 100644
--- a/debian/squeeze/applications/knetload/debian/knetload-trinity.manpages
+++ b/debian/_base/applications/knetload/debian/knetload-trinity.manpages
diff --git a/debian/squeeze/applications/knetload/debian/knetload.1 b/debian/_base/applications/knetload/debian/knetload.1
index 30b6c4e4d..30b6c4e4d 100644
--- a/debian/squeeze/applications/knetload/debian/knetload.1
+++ b/debian/_base/applications/knetload/debian/knetload.1
diff --git a/debian/squeeze/applications/knetload/debian/knetload.xpm b/debian/_base/applications/knetload/debian/knetload.xpm
index 3cc7ef17f..3cc7ef17f 100644
--- a/debian/squeeze/applications/knetload/debian/knetload.xpm
+++ b/debian/_base/applications/knetload/debian/knetload.xpm
diff --git a/debian/squeeze/applications/knetload/debian/menu b/debian/_base/applications/knetload/debian/menu
index a39b37e3c..a39b37e3c 100644
--- a/debian/squeeze/applications/knetload/debian/menu
+++ b/debian/_base/applications/knetload/debian/menu
diff --git a/debian/squeeze/applications/knetload/debian/rules b/debian/_base/applications/knetload/debian/rules
index 0a65d48d8..0a65d48d8 100755
--- a/debian/squeeze/applications/knetload/debian/rules
+++ b/debian/_base/applications/knetload/debian/rules
diff --git a/debian/squeeze/applications/knetload/debian/source/format b/debian/_base/applications/knetload/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/knetload/debian/source/format
+++ b/debian/_base/applications/knetload/debian/source/format
diff --git a/debian/squeeze/applications/knetload/debian/source/options b/debian/_base/applications/knetload/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/knetload/debian/source/options
+++ b/debian/_base/applications/knetload/debian/source/options
diff --git a/debian/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/knetstats/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk b/debian/_base/applications/knetstats/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk
+++ b/debian/_base/applications/knetstats/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/knetstats/debian/cdbs/versions.pl b/debian/_base/applications/knetstats/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/knetstats/debian/cdbs/versions.pl
+++ b/debian/_base/applications/knetstats/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/knetstats/debian/changelog b/debian/_base/applications/knetstats/debian/changelog
index d1015cb26..d1015cb26 100644
--- a/debian/squeeze/applications/knetstats/debian/changelog
+++ b/debian/_base/applications/knetstats/debian/changelog
diff --git a/debian/squeeze/applications/knetstats/debian/compat b/debian/_base/applications/knetstats/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knetstats/debian/compat
+++ b/debian/_base/applications/knetstats/debian/compat
diff --git a/debian/squeeze/applications/knetstats/debian/control b/debian/_base/applications/knetstats/debian/control
index a6957e601..a6957e601 100644
--- a/debian/squeeze/applications/knetstats/debian/control
+++ b/debian/_base/applications/knetstats/debian/control
diff --git a/debian/squeeze/applications/knetstats/debian/copyright b/debian/_base/applications/knetstats/debian/copyright
index bf7dbe0ed..bf7dbe0ed 100644
--- a/debian/squeeze/applications/knetstats/debian/copyright
+++ b/debian/_base/applications/knetstats/debian/copyright
diff --git a/debian/squeeze/applications/knetstats/debian/knetstats.1.docbook b/debian/_base/applications/knetstats/debian/knetstats.1.docbook
index 28b721f53..28b721f53 100644
--- a/debian/squeeze/applications/knetstats/debian/knetstats.1.docbook
+++ b/debian/_base/applications/knetstats/debian/knetstats.1.docbook
diff --git a/debian/squeeze/applications/knetstats/debian/patches/series b/debian/_base/applications/knetstats/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knetstats/debian/patches/series
+++ b/debian/_base/applications/knetstats/debian/patches/series
diff --git a/debian/squeeze/applications/knetstats/debian/rules b/debian/_base/applications/knetstats/debian/rules
index a19b60c8d..a19b60c8d 100755
--- a/debian/squeeze/applications/knetstats/debian/rules
+++ b/debian/_base/applications/knetstats/debian/rules
diff --git a/debian/squeeze/applications/knetstats/debian/source/format b/debian/_base/applications/knetstats/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/knetstats/debian/source/format
+++ b/debian/_base/applications/knetstats/debian/source/format
diff --git a/debian/squeeze/applications/knetstats/debian/source/options b/debian/_base/applications/knetstats/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/knetstats/debian/source/options
+++ b/debian/_base/applications/knetstats/debian/source/options
diff --git a/debian/squeeze/applications/knetstats/debian/watch b/debian/_base/applications/knetstats/debian/watch
index 8d12f40b0..8d12f40b0 100644
--- a/debian/squeeze/applications/knetstats/debian/watch
+++ b/debian/_base/applications/knetstats/debian/watch
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/README.source b/debian/_base/applications/knetworkmanager.cmake/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/README.source
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/README.source
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
index 2dff59226..2dff59226 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/kde.mk b/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/changelog b/debian/_base/applications/knetworkmanager.cmake/debian/changelog
index ed0d32a81..ed0d32a81 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/changelog
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/changelog
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/compat b/debian/_base/applications/knetworkmanager.cmake/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/compat
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/compat
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control b/debian/_base/applications/knetworkmanager.cmake/debian/control
index 73fa9be0d..73fa9be0d 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/control
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/control
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/copyright b/debian/_base/applications/knetworkmanager.cmake/debian/copyright
index 2490de254..2490de254 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/copyright
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/copyright
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/knetworkmanager.1 b/debian/_base/applications/knetworkmanager.cmake/debian/knetworkmanager.1
index 3cd261c89..3cd261c89 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/knetworkmanager.1
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/knetworkmanager.1
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/manpages b/debian/_base/applications/knetworkmanager.cmake/debian/manpages
index e2859341f..e2859341f 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/manpages
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/manpages
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/menu b/debian/_base/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..9775e9c7c 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/menu
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/menu
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..9ae01a92b 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst b/debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst
index fdd4e51ca..fdd4e51ca 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/patches/series b/debian/_base/applications/knetworkmanager.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/patches/series
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/patches/series
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/rules b/debian/_base/applications/knetworkmanager.cmake/debian/rules
index 4a5e56fb5..4a5e56fb5 100755
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/rules
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/rules
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/source/format b/debian/_base/applications/knetworkmanager.cmake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/source/format
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/source/format
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/source/options b/debian/_base/applications/knetworkmanager.cmake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/source/options
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/source/options
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/watch b/debian/_base/applications/knetworkmanager.cmake/debian/watch
index ad7a7be91..ad7a7be91 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/watch
+++ b/debian/_base/applications/knetworkmanager.cmake/debian/watch
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/README.source b/debian/_base/applications/knetworkmanager8/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/README.source
+++ b/debian/_base/applications/knetworkmanager8/debian/README.source
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk b/debian/_base/applications/knetworkmanager8/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
+++ b/debian/_base/applications/knetworkmanager8/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl b/debian/_base/applications/knetworkmanager8/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/versions.pl
+++ b/debian/_base/applications/knetworkmanager8/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/changelog b/debian/_base/applications/knetworkmanager8/debian/changelog
index c65f5ff4a..c65f5ff4a 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/changelog
+++ b/debian/_base/applications/knetworkmanager8/debian/changelog
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/compat b/debian/_base/applications/knetworkmanager8/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/compat
+++ b/debian/_base/applications/knetworkmanager8/debian/compat
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/control b/debian/_base/applications/knetworkmanager8/debian/control
index f495834f5..f495834f5 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/control
+++ b/debian/_base/applications/knetworkmanager8/debian/control
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/copyright b/debian/_base/applications/knetworkmanager8/debian/copyright
index 2490de254..2490de254 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/copyright
+++ b/debian/_base/applications/knetworkmanager8/debian/copyright
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1 b/debian/_base/applications/knetworkmanager8/debian/knetworkmanager.1
index 3cd261c89..3cd261c89 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/knetworkmanager.1
+++ b/debian/_base/applications/knetworkmanager8/debian/knetworkmanager.1
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/manpages b/debian/_base/applications/knetworkmanager8/debian/manpages
index e2859341f..e2859341f 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/manpages
+++ b/debian/_base/applications/knetworkmanager8/debian/manpages
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/menu b/debian/_base/applications/knetworkmanager8/debian/menu
index 9775e9c7c..9775e9c7c 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/menu
+++ b/debian/_base/applications/knetworkmanager8/debian/menu
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..9ae01a92b 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
+++ b/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
index fdd4e51ca..fdd4e51ca 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
+++ b/debian/_base/applications/knetworkmanager8/debian/network-manager-kde-trinity.postinst
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/patches/series b/debian/_base/applications/knetworkmanager8/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/patches/series
+++ b/debian/_base/applications/knetworkmanager8/debian/patches/series
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/rules b/debian/_base/applications/knetworkmanager8/debian/rules
index ee316c12f..ee316c12f 100755
--- a/debian/squeeze/applications/knetworkmanager8/debian/rules
+++ b/debian/_base/applications/knetworkmanager8/debian/rules
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/source/format b/debian/_base/applications/knetworkmanager8/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/source/format
+++ b/debian/_base/applications/knetworkmanager8/debian/source/format
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/source/options b/debian/_base/applications/knetworkmanager8/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/source/options
+++ b/debian/_base/applications/knetworkmanager8/debian/source/options
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/watch b/debian/_base/applications/knetworkmanager8/debian/watch
index ad7a7be91..ad7a7be91 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/watch
+++ b/debian/_base/applications/knetworkmanager8/debian/watch
diff --git a/debian/squeeze/applications/knights/debian/changelog b/debian/_base/applications/knights/debian/changelog
index 5dfb85e8c..5dfb85e8c 100644
--- a/debian/squeeze/applications/knights/debian/changelog
+++ b/debian/_base/applications/knights/debian/changelog
diff --git a/debian/squeeze/applications/knights/debian/compat b/debian/_base/applications/knights/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knights/debian/compat
+++ b/debian/_base/applications/knights/debian/compat
diff --git a/debian/squeeze/applications/knights/debian/control b/debian/_base/applications/knights/debian/control
index 6bdfad971..6bdfad971 100644
--- a/debian/squeeze/applications/knights/debian/control
+++ b/debian/_base/applications/knights/debian/control
diff --git a/debian/squeeze/applications/knights/debian/copyright b/debian/_base/applications/knights/debian/copyright
index c8554f7b5..c8554f7b5 100644
--- a/debian/squeeze/applications/knights/debian/copyright
+++ b/debian/_base/applications/knights/debian/copyright
diff --git a/debian/squeeze/applications/knights/debian/debiandirs b/debian/_base/applications/knights/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/debian/squeeze/applications/knights/debian/debiandirs
+++ b/debian/_base/applications/knights/debian/debiandirs
diff --git a/debian/squeeze/applications/knights/debian/docs b/debian/_base/applications/knights/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/knights/debian/docs
+++ b/debian/_base/applications/knights/debian/docs
diff --git a/debian/squeeze/applications/knights/debian/knights.1 b/debian/_base/applications/knights/debian/knights.1
index d66f50342..d66f50342 100644
--- a/debian/squeeze/applications/knights/debian/knights.1
+++ b/debian/_base/applications/knights/debian/knights.1
diff --git a/debian/squeeze/applications/knights/debian/knights.xpm b/debian/_base/applications/knights/debian/knights.xpm
index afbf1959a..afbf1959a 100644
--- a/debian/squeeze/applications/knights/debian/knights.xpm
+++ b/debian/_base/applications/knights/debian/knights.xpm
diff --git a/debian/squeeze/applications/knights/debian/menu b/debian/_base/applications/knights/debian/menu
index f2f72ca74..f2f72ca74 100644
--- a/debian/squeeze/applications/knights/debian/menu
+++ b/debian/_base/applications/knights/debian/menu
diff --git a/debian/squeeze/applications/knights/debian/patches/.gitignore b/debian/_base/applications/knights/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knights/debian/patches/.gitignore
+++ b/debian/_base/applications/knights/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/knights/debian/rules b/debian/_base/applications/knights/debian/rules
index bde510e8b..bde510e8b 100755
--- a/debian/squeeze/applications/knights/debian/rules
+++ b/debian/_base/applications/knights/debian/rules
diff --git a/debian/squeeze/applications/knights/debian/source/format b/debian/_base/applications/knights/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/knights/debian/source/format
+++ b/debian/_base/applications/knights/debian/source/format
diff --git a/debian/squeeze/applications/knights/debian/source/options b/debian/_base/applications/knights/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/knights/debian/source/options
+++ b/debian/_base/applications/knights/debian/source/options
diff --git a/debian/squeeze/applications/knights/debian/watch b/debian/_base/applications/knights/debian/watch
index e3fef441b..e3fef441b 100644
--- a/debian/squeeze/applications/knights/debian/watch
+++ b/debian/_base/applications/knights/debian/watch
diff --git a/debian/squeeze/applications/knowit/debian/changelog b/debian/_base/applications/knowit/debian/changelog
index b5d67442f..b5d67442f 100644
--- a/debian/squeeze/applications/knowit/debian/changelog
+++ b/debian/_base/applications/knowit/debian/changelog
diff --git a/debian/squeeze/applications/knowit/debian/compat b/debian/_base/applications/knowit/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knowit/debian/compat
+++ b/debian/_base/applications/knowit/debian/compat
diff --git a/debian/squeeze/applications/knowit/debian/control b/debian/_base/applications/knowit/debian/control
index 7772cf0da..7772cf0da 100644
--- a/debian/squeeze/applications/knowit/debian/control
+++ b/debian/_base/applications/knowit/debian/control
diff --git a/debian/squeeze/applications/knowit/debian/copyright b/debian/_base/applications/knowit/debian/copyright
index 008edff30..008edff30 100644
--- a/debian/squeeze/applications/knowit/debian/copyright
+++ b/debian/_base/applications/knowit/debian/copyright
diff --git a/debian/squeeze/applications/knowit/debian/docs b/debian/_base/applications/knowit/debian/docs
index 5502ed8f4..5502ed8f4 100644
--- a/debian/squeeze/applications/knowit/debian/docs
+++ b/debian/_base/applications/knowit/debian/docs
diff --git a/debian/squeeze/applications/knowit/debian/knowit.1 b/debian/_base/applications/knowit/debian/knowit.1
index a19da8be1..a19da8be1 100644
--- a/debian/squeeze/applications/knowit/debian/knowit.1
+++ b/debian/_base/applications/knowit/debian/knowit.1
diff --git a/debian/squeeze/applications/knowit/debian/rules b/debian/_base/applications/knowit/debian/rules
index 77f1d05a4..77f1d05a4 100755
--- a/debian/squeeze/applications/knowit/debian/rules
+++ b/debian/_base/applications/knowit/debian/rules
diff --git a/debian/squeeze/applications/knowit/debian/source/format b/debian/_base/applications/knowit/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/knowit/debian/source/format
+++ b/debian/_base/applications/knowit/debian/source/format
diff --git a/debian/squeeze/applications/knowit/debian/source/options b/debian/_base/applications/knowit/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/knowit/debian/source/options
+++ b/debian/_base/applications/knowit/debian/source/options
diff --git a/debian/squeeze/applications/knowit/debian/watch b/debian/_base/applications/knowit/debian/watch
index 0c83833f0..0c83833f0 100644
--- a/debian/squeeze/applications/knowit/debian/watch
+++ b/debian/_base/applications/knowit/debian/watch
diff --git a/debian/squeeze/applications/knutclient/debian/changelog b/debian/_base/applications/knutclient/debian/changelog
index e63f05435..e63f05435 100644
--- a/debian/squeeze/applications/knutclient/debian/changelog
+++ b/debian/_base/applications/knutclient/debian/changelog
diff --git a/debian/squeeze/applications/knutclient/debian/compat b/debian/_base/applications/knutclient/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knutclient/debian/compat
+++ b/debian/_base/applications/knutclient/debian/compat
diff --git a/debian/squeeze/applications/knutclient/debian/control b/debian/_base/applications/knutclient/debian/control
index 5312ffe33..5312ffe33 100644
--- a/debian/squeeze/applications/knutclient/debian/control
+++ b/debian/_base/applications/knutclient/debian/control
diff --git a/debian/squeeze/applications/knutclient/debian/copyright b/debian/_base/applications/knutclient/debian/copyright
index 2d9b4b658..2d9b4b658 100644
--- a/debian/squeeze/applications/knutclient/debian/copyright
+++ b/debian/_base/applications/knutclient/debian/copyright
diff --git a/debian/squeeze/applications/knutclient/debian/knutclient.1x b/debian/_base/applications/knutclient/debian/knutclient.1x
index 231658277..231658277 100644
--- a/debian/squeeze/applications/knutclient/debian/knutclient.1x
+++ b/debian/_base/applications/knutclient/debian/knutclient.1x
diff --git a/debian/squeeze/applications/knutclient/debian/knutclient.menu b/debian/_base/applications/knutclient/debian/knutclient.menu
index a520f80ba..a520f80ba 100644
--- a/debian/squeeze/applications/knutclient/debian/knutclient.menu
+++ b/debian/_base/applications/knutclient/debian/knutclient.menu
diff --git a/debian/squeeze/applications/knutclient/debian/preinst b/debian/_base/applications/knutclient/debian/preinst
index 17d2ead82..17d2ead82 100644
--- a/debian/squeeze/applications/knutclient/debian/preinst
+++ b/debian/_base/applications/knutclient/debian/preinst
diff --git a/debian/squeeze/applications/knutclient/debian/rules b/debian/_base/applications/knutclient/debian/rules
index a009dbf98..a009dbf98 100755
--- a/debian/squeeze/applications/knutclient/debian/rules
+++ b/debian/_base/applications/knutclient/debian/rules
diff --git a/debian/squeeze/applications/knutclient/debian/source/format b/debian/_base/applications/knutclient/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/knutclient/debian/source/format
+++ b/debian/_base/applications/knutclient/debian/source/format
diff --git a/debian/squeeze/applications/knutclient/debian/source/options b/debian/_base/applications/knutclient/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/knutclient/debian/source/options
+++ b/debian/_base/applications/knutclient/debian/source/options
diff --git a/debian/squeeze/applications/knutclient/debian/watch b/debian/_base/applications/knutclient/debian/watch
index 231bd3e50..231bd3e50 100644
--- a/debian/squeeze/applications/knutclient/debian/watch
+++ b/debian/_base/applications/knutclient/debian/watch
diff --git a/debian/squeeze/applications/koffice-i18n/debian/changelog b/debian/_base/applications/koffice-i18n/debian/changelog
index 26f667147..26f667147 100644
--- a/debian/squeeze/applications/koffice-i18n/debian/changelog
+++ b/debian/_base/applications/koffice-i18n/debian/changelog
diff --git a/debian/squeeze/applications/koffice-i18n/debian/compat b/debian/_base/applications/koffice-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/koffice-i18n/debian/compat
+++ b/debian/_base/applications/koffice-i18n/debian/compat
diff --git a/debian/squeeze/applications/koffice-i18n/debian/control b/debian/_base/applications/koffice-i18n/debian/control
index f0d1f9757..f0d1f9757 100644
--- a/debian/squeeze/applications/koffice-i18n/debian/control
+++ b/debian/_base/applications/koffice-i18n/debian/control
diff --git a/debian/squeeze/applications/koffice-i18n/debian/copyright b/debian/_base/applications/koffice-i18n/debian/copyright
index 2ab72642a..2ab72642a 100644
--- a/debian/squeeze/applications/koffice-i18n/debian/copyright
+++ b/debian/_base/applications/koffice-i18n/debian/copyright
diff --git a/debian/squeeze/applications/koffice-i18n/debian/debiandirs b/debian/_base/applications/koffice-i18n/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/debian/squeeze/applications/koffice-i18n/debian/debiandirs
+++ b/debian/_base/applications/koffice-i18n/debian/debiandirs
diff --git a/debian/squeeze/applications/koffice-i18n/debian/rules b/debian/_base/applications/koffice-i18n/debian/rules
index 478c97b9d..478c97b9d 100755
--- a/debian/squeeze/applications/koffice-i18n/debian/rules
+++ b/debian/_base/applications/koffice-i18n/debian/rules
diff --git a/debian/squeeze/applications/koffice-i18n/debian/source/format b/debian/_base/applications/koffice-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/koffice-i18n/debian/source/format
+++ b/debian/_base/applications/koffice-i18n/debian/source/format
diff --git a/debian/squeeze/applications/koffice-i18n/debian/source/options b/debian/_base/applications/koffice-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/koffice-i18n/debian/source/options
+++ b/debian/_base/applications/koffice-i18n/debian/source/options
diff --git a/debian/squeeze/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ec579c644..ec579c644 100644
--- a/debian/squeeze/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/applications/koffice/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/applications/koffice/debian/README.MimeType b/debian/_base/applications/koffice/debian/README.MimeType
index 7d9888658..7d9888658 100644
--- a/debian/squeeze/applications/koffice/debian/README.MimeType
+++ b/debian/_base/applications/koffice/debian/README.MimeType
diff --git a/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/koffice/debian/cdbs/debian-qt-kde.mk
index cdfe0a8ea..cdfe0a8ea 100644
--- a/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/koffice/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/koffice/debian/cdbs/kde.mk b/debian/_base/applications/koffice/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/koffice/debian/cdbs/kde.mk
+++ b/debian/_base/applications/koffice/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/koffice/debian/cdbs/versions.pl b/debian/_base/applications/koffice/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/koffice/debian/cdbs/versions.pl
+++ b/debian/_base/applications/koffice/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install b/debian/_base/applications/koffice/debian/chalk-data-trinity.install
index a37b11ace..a37b11ace 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.install
+++ b/debian/_base/applications/koffice/debian/chalk-data-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.lintian b/debian/_base/applications/koffice/debian/chalk-data-trinity.lintian
index 909a9062a..909a9062a 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/chalk-data-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.docs b/debian/_base/applications/koffice/debian/chalk-trinity.docs
index 99cd93d41..99cd93d41 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.docs
+++ b/debian/_base/applications/koffice/debian/chalk-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.install b/debian/_base/applications/koffice/debian/chalk-trinity.install
index a36c77eb8..a36c77eb8 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.install
+++ b/debian/_base/applications/koffice/debian/chalk-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian b/debian/_base/applications/koffice/debian/chalk-trinity.lintian
index ef467a3e1..ef467a3e1 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/chalk-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.menu b/debian/_base/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..2354092d2 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
+++ b/debian/_base/applications/koffice/debian/chalk-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.mime b/debian/_base/applications/koffice/debian/chalk-trinity.mime
index 86a95ce5b..86a95ce5b 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.mime
+++ b/debian/_base/applications/koffice/debian/chalk-trinity.mime
diff --git a/debian/squeeze/applications/koffice/debian/chalk.xpm b/debian/_base/applications/koffice/debian/chalk.xpm
index 0edc4f49a..0edc4f49a 100644
--- a/debian/squeeze/applications/koffice/debian/chalk.xpm
+++ b/debian/_base/applications/koffice/debian/chalk.xpm
diff --git a/debian/squeeze/applications/koffice/debian/changelog b/debian/_base/applications/koffice/debian/changelog
index 8ce61b75e..8ce61b75e 100644
--- a/debian/squeeze/applications/koffice/debian/changelog
+++ b/debian/_base/applications/koffice/debian/changelog
diff --git a/debian/squeeze/applications/koffice/debian/compat b/debian/_base/applications/koffice/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/koffice/debian/compat
+++ b/debian/_base/applications/koffice/debian/compat
diff --git a/debian/squeeze/applications/koffice/debian/control b/debian/_base/applications/koffice/debian/control
index 19fe327ab..19fe327ab 100644
--- a/debian/squeeze/applications/koffice/debian/control
+++ b/debian/_base/applications/koffice/debian/control
diff --git a/debian/squeeze/applications/koffice/debian/copyright b/debian/_base/applications/koffice/debian/copyright
index 900ced776..900ced776 100644
--- a/debian/squeeze/applications/koffice/debian/copyright
+++ b/debian/_base/applications/koffice/debian/copyright
diff --git a/debian/squeeze/applications/koffice/debian/fogra27l.icm.uu b/debian/_base/applications/koffice/debian/fogra27l.icm.uu
index 39417fc89..39417fc89 100644
--- a/debian/squeeze/applications/koffice/debian/fogra27l.icm.uu
+++ b/debian/_base/applications/koffice/debian/fogra27l.icm.uu
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.docs b/debian/_base/applications/koffice/debian/karbon-trinity.docs
index 975685c5b..975685c5b 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.docs
+++ b/debian/_base/applications/koffice/debian/karbon-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.install b/debian/_base/applications/koffice/debian/karbon-trinity.install
index 669e5d49d..669e5d49d 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.install
+++ b/debian/_base/applications/koffice/debian/karbon-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian b/debian/_base/applications/koffice/debian/karbon-trinity.lintian
index f399de402..f399de402 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/karbon-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.manpages b/debian/_base/applications/koffice/debian/karbon-trinity.manpages
index 8a212a2b2..8a212a2b2 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/karbon-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.menu b/debian/_base/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..0329fc505 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
+++ b/debian/_base/applications/koffice/debian/karbon-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.mime b/debian/_base/applications/koffice/debian/karbon-trinity.mime
index 30e0e75b0..30e0e75b0 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.mime
+++ b/debian/_base/applications/koffice/debian/karbon-trinity.mime
diff --git a/debian/squeeze/applications/koffice/debian/karbon.1 b/debian/_base/applications/koffice/debian/karbon.1
index fa077706a..fa077706a 100644
--- a/debian/squeeze/applications/koffice/debian/karbon.1
+++ b/debian/_base/applications/koffice/debian/karbon.1
diff --git a/debian/squeeze/applications/koffice/debian/karbon.xpm b/debian/_base/applications/koffice/debian/karbon.xpm
index 92f24765d..92f24765d 100644
--- a/debian/squeeze/applications/koffice/debian/karbon.xpm
+++ b/debian/_base/applications/koffice/debian/karbon.xpm
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.README.Debian b/debian/_base/applications/koffice/debian/kchart-trinity.README.Debian
index ab998f150..ab998f150 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/kchart-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.docs b/debian/_base/applications/koffice/debian/kchart-trinity.docs
index d79e8fa24..d79e8fa24 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.docs
+++ b/debian/_base/applications/koffice/debian/kchart-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.install b/debian/_base/applications/koffice/debian/kchart-trinity.install
index cc59b8a8f..cc59b8a8f 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.install
+++ b/debian/_base/applications/koffice/debian/kchart-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian b/debian/_base/applications/koffice/debian/kchart-trinity.lintian
index f81d8d6f7..f81d8d6f7 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kchart-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.manpages b/debian/_base/applications/koffice/debian/kchart-trinity.manpages
index 38c864763..38c864763 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/kchart-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.menu b/debian/_base/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..405e19fec 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
+++ b/debian/_base/applications/koffice/debian/kchart-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.mime b/debian/_base/applications/koffice/debian/kchart-trinity.mime
index 7b0f739ff..7b0f739ff 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.mime
+++ b/debian/_base/applications/koffice/debian/kchart-trinity.mime
diff --git a/debian/squeeze/applications/koffice/debian/kchart.1 b/debian/_base/applications/koffice/debian/kchart.1
index 0b2c8a4c3..0b2c8a4c3 100644
--- a/debian/squeeze/applications/koffice/debian/kchart.1
+++ b/debian/_base/applications/koffice/debian/kchart.1
diff --git a/debian/squeeze/applications/koffice/debian/kchart.xpm b/debian/_base/applications/koffice/debian/kchart.xpm
index 4b1c6e11d..4b1c6e11d 100644
--- a/debian/squeeze/applications/koffice/debian/kchart.xpm
+++ b/debian/_base/applications/koffice/debian/kchart.xpm
diff --git a/debian/squeeze/applications/koffice/debian/kexi-trinity.docs b/debian/_base/applications/koffice/debian/kexi-trinity.docs
index 2633ffdfd..2633ffdfd 100644
--- a/debian/squeeze/applications/koffice/debian/kexi-trinity.docs
+++ b/debian/_base/applications/koffice/debian/kexi-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/kexi-trinity.install b/debian/_base/applications/koffice/debian/kexi-trinity.install
index fb80fb2bc..fb80fb2bc 100644
--- a/debian/squeeze/applications/koffice/debian/kexi-trinity.install
+++ b/debian/_base/applications/koffice/debian/kexi-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian b/debian/_base/applications/koffice/debian/kexi-trinity.lintian
index 07d1301aa..07d1301aa 100644
--- a/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kexi-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.README.Debian b/debian/_base/applications/koffice/debian/kformula-trinity.README.Debian
index bfd5bb7e5..bfd5bb7e5 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/kformula-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.docs b/debian/_base/applications/koffice/debian/kformula-trinity.docs
index a5ddd1f27..a5ddd1f27 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.docs
+++ b/debian/_base/applications/koffice/debian/kformula-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.install b/debian/_base/applications/koffice/debian/kformula-trinity.install
index 0ec37116a..0ec37116a 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.install
+++ b/debian/_base/applications/koffice/debian/kformula-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian b/debian/_base/applications/koffice/debian/kformula-trinity.lintian
index ec8c2f644..ec8c2f644 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kformula-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.manpages b/debian/_base/applications/koffice/debian/kformula-trinity.manpages
index 35c78eaa9..35c78eaa9 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/kformula-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.menu b/debian/_base/applications/koffice/debian/kformula-trinity.menu
index 37f699400..37f699400 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.menu
+++ b/debian/_base/applications/koffice/debian/kformula-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.mime b/debian/_base/applications/koffice/debian/kformula-trinity.mime
index 5687b0f24..5687b0f24 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.mime
+++ b/debian/_base/applications/koffice/debian/kformula-trinity.mime
diff --git a/debian/squeeze/applications/koffice/debian/kformula.1 b/debian/_base/applications/koffice/debian/kformula.1
index 801df0727..801df0727 100644
--- a/debian/squeeze/applications/koffice/debian/kformula.1
+++ b/debian/_base/applications/koffice/debian/kformula.1
diff --git a/debian/squeeze/applications/koffice/debian/kformula.xpm b/debian/_base/applications/koffice/debian/kformula.xpm
index b42f4e220..b42f4e220 100644
--- a/debian/squeeze/applications/koffice/debian/kformula.xpm
+++ b/debian/_base/applications/koffice/debian/kformula.xpm
diff --git a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.README.Debian b/debian/_base/applications/koffice/debian/kivio-data-trinity.README.Debian
index 0b97a4e69..0b97a4e69 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/kivio-data-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.docs b/debian/_base/applications/koffice/debian/kivio-data-trinity.docs
index db5dbf658..db5dbf658 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.docs
+++ b/debian/_base/applications/koffice/debian/kivio-data-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.install b/debian/_base/applications/koffice/debian/kivio-data-trinity.install
index 02f3c0322..02f3c0322 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.install
+++ b/debian/_base/applications/koffice/debian/kivio-data-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian b/debian/_base/applications/koffice/debian/kivio-data-trinity.lintian
index 4eb29a57e..4eb29a57e 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kivio-data-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.docs b/debian/_base/applications/koffice/debian/kivio-trinity.docs
index 0ec5716cd..0ec5716cd 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.docs
+++ b/debian/_base/applications/koffice/debian/kivio-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.install b/debian/_base/applications/koffice/debian/kivio-trinity.install
index 510c85320..510c85320 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.install
+++ b/debian/_base/applications/koffice/debian/kivio-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian b/debian/_base/applications/koffice/debian/kivio-trinity.lintian
index 00d1d2875..00d1d2875 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kivio-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.manpages b/debian/_base/applications/koffice/debian/kivio-trinity.manpages
index 1f348c0ca..1f348c0ca 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/kivio-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.menu b/debian/_base/applications/koffice/debian/kivio-trinity.menu
index db45a4245..db45a4245 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
+++ b/debian/_base/applications/koffice/debian/kivio-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.mime b/debian/_base/applications/koffice/debian/kivio-trinity.mime
index 637162677..637162677 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.mime
+++ b/debian/_base/applications/koffice/debian/kivio-trinity.mime
diff --git a/debian/squeeze/applications/koffice/debian/kivio.1 b/debian/_base/applications/koffice/debian/kivio.1
index 0ae1aa215..0ae1aa215 100644
--- a/debian/squeeze/applications/koffice/debian/kivio.1
+++ b/debian/_base/applications/koffice/debian/kivio.1
diff --git a/debian/squeeze/applications/koffice/debian/kivio.xpm b/debian/_base/applications/koffice/debian/kivio.xpm
index 0d9c9b122..0d9c9b122 100644
--- a/debian/squeeze/applications/koffice/debian/kivio.xpm
+++ b/debian/_base/applications/koffice/debian/kivio.xpm
diff --git a/debian/squeeze/applications/koffice/debian/koconverter.1 b/debian/_base/applications/koffice/debian/koconverter.1
index 95eab71a2..95eab71a2 100644
--- a/debian/squeeze/applications/koffice/debian/koconverter.1
+++ b/debian/_base/applications/koffice/debian/koconverter.1
diff --git a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.README.Debian b/debian/_base/applications/koffice/debian/koffice-data-trinity.README.Debian
index eb49daa16..eb49daa16 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/koffice-data-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.docs b/debian/_base/applications/koffice/debian/koffice-data-trinity.docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.docs
+++ b/debian/_base/applications/koffice/debian/koffice-data-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.install b/debian/_base/applications/koffice/debian/koffice-data-trinity.install
index 2f17354e2..2f17354e2 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.install
+++ b/debian/_base/applications/koffice/debian/koffice-data-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.links b/debian/_base/applications/koffice/debian/koffice-data-trinity.links
index f85e205f2..f85e205f2 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-data-trinity.links
+++ b/debian/_base/applications/koffice/debian/koffice-data-trinity.links
diff --git a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install b/debian/_base/applications/koffice/debian/koffice-dev-trinity.install
index c65cbd3d3..c65cbd3d3 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/_base/applications/koffice/debian/koffice-dev-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.README.Debian b/debian/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian
index 1feeb83d9..1feeb83d9 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/koffice-libs-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.docs b/debian/_base/applications/koffice/debian/koffice-libs-trinity.docs
index 53238b144..53238b144 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.docs
+++ b/debian/_base/applications/koffice/debian/koffice-libs-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.install b/debian/_base/applications/koffice/debian/koffice-libs-trinity.install
index 8d1ecc1d3..8d1ecc1d3 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.install
+++ b/debian/_base/applications/koffice/debian/koffice-libs-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.links b/debian/_base/applications/koffice/debian/koffice-libs-trinity.links
index b0df87ed7..b0df87ed7 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.links
+++ b/debian/_base/applications/koffice/debian/koffice-libs-trinity.links
diff --git a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.lintian b/debian/_base/applications/koffice/debian/koffice-libs-trinity.lintian
index 1137a9b12..1137a9b12 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/koffice-libs-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.manpages b/debian/_base/applications/koffice/debian/koffice-libs-trinity.manpages
index 52c63b5d7..52c63b5d7 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/koffice-libs-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
index bedc6cae9..bedc6cae9 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
index 65271eda0..65271eda0 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
index 0b6a7dbaa..0b6a7dbaa 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
index f6b06085b..f6b06085b 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
index 561d95388..561d95388 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
index 1e5b4ef84..1e5b4ef84 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
index 4d4e5727b..4d4e5727b 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
index 09953babd..09953babd 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
index 9e168a19f..9e168a19f 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc.install b/debian/_base/applications/koffice/debian/koffice-trinity-doc.install
index a3aaf470b..a3aaf470b 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity-doc.install
+++ b/debian/_base/applications/koffice/debian/koffice-trinity-doc.install
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity.README.Debian b/debian/_base/applications/koffice/debian/koffice-trinity.README.Debian
index 7d5f525a3..7d5f525a3 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/koffice-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/koffice-trinity.docs b/debian/_base/applications/koffice/debian/koffice-trinity.docs
index 53238b144..53238b144 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-trinity.docs
+++ b/debian/_base/applications/koffice/debian/koffice-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/koscript.1 b/debian/_base/applications/koffice/debian/koscript.1
index 9517c3f74..9517c3f74 100644
--- a/debian/squeeze/applications/koffice/debian/koscript.1
+++ b/debian/_base/applications/koffice/debian/koscript.1
diff --git a/debian/squeeze/applications/koffice/debian/koshell-trinity.docs b/debian/_base/applications/koffice/debian/koshell-trinity.docs
index 6ade957d9..6ade957d9 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.docs
+++ b/debian/_base/applications/koffice/debian/koshell-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/koshell-trinity.install b/debian/_base/applications/koffice/debian/koshell-trinity.install
index a6670c1ae..a6670c1ae 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.install
+++ b/debian/_base/applications/koffice/debian/koshell-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian b/debian/_base/applications/koffice/debian/koshell-trinity.lintian
index 073ee53ab..073ee53ab 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/koshell-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/koshell-trinity.manpages b/debian/_base/applications/koffice/debian/koshell-trinity.manpages
index fc332a5cc..fc332a5cc 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/koshell-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/koshell-trinity.menu b/debian/_base/applications/koffice/debian/koshell-trinity.menu
index ec838c038..ec838c038 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.menu
+++ b/debian/_base/applications/koffice/debian/koshell-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/koshell.1 b/debian/_base/applications/koffice/debian/koshell.1
index 2213dc554..2213dc554 100644
--- a/debian/squeeze/applications/koffice/debian/koshell.1
+++ b/debian/_base/applications/koffice/debian/koshell.1
diff --git a/debian/squeeze/applications/koffice/debian/koshell.xpm b/debian/_base/applications/koffice/debian/koshell.xpm
index 25dc6e976..25dc6e976 100644
--- a/debian/squeeze/applications/koffice/debian/koshell.xpm
+++ b/debian/_base/applications/koffice/debian/koshell.xpm
diff --git a/debian/squeeze/applications/koffice/debian/kplato-trinity.install b/debian/_base/applications/koffice/debian/kplato-trinity.install
index c4b1bc359..c4b1bc359 100644
--- a/debian/squeeze/applications/koffice/debian/kplato-trinity.install
+++ b/debian/_base/applications/koffice/debian/kplato-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian b/debian/_base/applications/koffice/debian/kplato-trinity.lintian
index 5237efd72..5237efd72 100644
--- a/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kplato-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kprconverter.pl.1 b/debian/_base/applications/koffice/debian/kprconverter.pl.1
index bd6bdfd66..bd6bdfd66 100644
--- a/debian/squeeze/applications/koffice/debian/kprconverter.pl.1
+++ b/debian/_base/applications/koffice/debian/kprconverter.pl.1
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.install b/debian/_base/applications/koffice/debian/kpresenter-data-trinity.install
index 3322113fc..3322113fc 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.install
+++ b/debian/_base/applications/koffice/debian/kpresenter-data-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/_base/applications/koffice/debian/kpresenter-data-trinity.lintian
index 0756d2647..0756d2647 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kpresenter-data-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.README.Debian b/debian/_base/applications/koffice/debian/kpresenter-trinity.README.Debian
index d1142abfb..d1142abfb 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/kpresenter-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.docs b/debian/_base/applications/koffice/debian/kpresenter-trinity.docs
index b1fdb5570..b1fdb5570 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.docs
+++ b/debian/_base/applications/koffice/debian/kpresenter-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.install b/debian/_base/applications/koffice/debian/kpresenter-trinity.install
index fc90edce6..fc90edce6 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.install
+++ b/debian/_base/applications/koffice/debian/kpresenter-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian b/debian/_base/applications/koffice/debian/kpresenter-trinity.lintian
index 2445c57ce..2445c57ce 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kpresenter-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.manpages b/debian/_base/applications/koffice/debian/kpresenter-trinity.manpages
index 3357e6954..3357e6954 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/kpresenter-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu b/debian/_base/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..52bff66e1 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
+++ b/debian/_base/applications/koffice/debian/kpresenter-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.mime b/debian/_base/applications/koffice/debian/kpresenter-trinity.mime
index 9ddd38545..9ddd38545 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.mime
+++ b/debian/_base/applications/koffice/debian/kpresenter-trinity.mime
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter.1 b/debian/_base/applications/koffice/debian/kpresenter.1
index 7eb96d7f2..7eb96d7f2 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter.1
+++ b/debian/_base/applications/koffice/debian/kpresenter.1
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter.xpm b/debian/_base/applications/koffice/debian/kpresenter.xpm
index c1465a6f3..c1465a6f3 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter.xpm
+++ b/debian/_base/applications/koffice/debian/kpresenter.xpm
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.README.Debian b/debian/_base/applications/koffice/debian/kspread-trinity.README.Debian
index 697074b1e..697074b1e 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/kspread-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.docs b/debian/_base/applications/koffice/debian/kspread-trinity.docs
index 96e2fe386..96e2fe386 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.docs
+++ b/debian/_base/applications/koffice/debian/kspread-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.examples b/debian/_base/applications/koffice/debian/kspread-trinity.examples
index ad588b752..ad588b752 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.examples
+++ b/debian/_base/applications/koffice/debian/kspread-trinity.examples
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.install b/debian/_base/applications/koffice/debian/kspread-trinity.install
index eee4ef24f..eee4ef24f 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.install
+++ b/debian/_base/applications/koffice/debian/kspread-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian b/debian/_base/applications/koffice/debian/kspread-trinity.lintian
index 370d6a7f9..370d6a7f9 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kspread-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.manpages b/debian/_base/applications/koffice/debian/kspread-trinity.manpages
index 833228aec..833228aec 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/kspread-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.menu b/debian/_base/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..8a6987024 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
+++ b/debian/_base/applications/koffice/debian/kspread-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.mime b/debian/_base/applications/koffice/debian/kspread-trinity.mime
index 14b369e46..14b369e46 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.mime
+++ b/debian/_base/applications/koffice/debian/kspread-trinity.mime
diff --git a/debian/squeeze/applications/koffice/debian/kspread.1 b/debian/_base/applications/koffice/debian/kspread.1
index 3ae324559..3ae324559 100644
--- a/debian/squeeze/applications/koffice/debian/kspread.1
+++ b/debian/_base/applications/koffice/debian/kspread.1
diff --git a/debian/squeeze/applications/koffice/debian/kspread.xpm b/debian/_base/applications/koffice/debian/kspread.xpm
index ddc117b6b..ddc117b6b 100644
--- a/debian/squeeze/applications/koffice/debian/kspread.xpm
+++ b/debian/_base/applications/koffice/debian/kspread.xpm
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.install b/debian/_base/applications/koffice/debian/kthesaurus-trinity.install
index c5190eb05..c5190eb05 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.install
+++ b/debian/_base/applications/koffice/debian/kthesaurus-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/_base/applications/koffice/debian/kthesaurus-trinity.lintian
index ba2ff8197..ba2ff8197 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kthesaurus-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.manpages b/debian/_base/applications/koffice/debian/kthesaurus-trinity.manpages
index 4fb6feb79..4fb6feb79 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/kthesaurus-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.menu b/debian/_base/applications/koffice/debian/kthesaurus-trinity.menu
index e2e0f4256..e2e0f4256 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.menu
+++ b/debian/_base/applications/koffice/debian/kthesaurus-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus.1 b/debian/_base/applications/koffice/debian/kthesaurus.1
index f5fba2153..f5fba2153 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus.1
+++ b/debian/_base/applications/koffice/debian/kthesaurus.1
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus.xpm b/debian/_base/applications/koffice/debian/kthesaurus.xpm
index fec4f069b..fec4f069b 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus.xpm
+++ b/debian/_base/applications/koffice/debian/kthesaurus.xpm
diff --git a/debian/squeeze/applications/koffice/debian/kudesigner.1 b/debian/_base/applications/koffice/debian/kudesigner.1
index b293d0016..b293d0016 100644
--- a/debian/squeeze/applications/koffice/debian/kudesigner.1
+++ b/debian/_base/applications/koffice/debian/kudesigner.1
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.README.Debian b/debian/_base/applications/koffice/debian/kugar-trinity.README.Debian
index fd3e6b053..fd3e6b053 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.docs b/debian/_base/applications/koffice/debian/kugar-trinity.docs
index 9943eb16c..9943eb16c 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.docs
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.examples b/debian/_base/applications/koffice/debian/kugar-trinity.examples
index a96de7575..a96de7575 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.examples
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.examples
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.examples.README b/debian/_base/applications/koffice/debian/kugar-trinity.examples.README
index 9b7cb6fe6..9b7cb6fe6 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.examples.README
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.examples.README
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.install b/debian/_base/applications/koffice/debian/kugar-trinity.install
index 99a9264f1..99a9264f1 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.install
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.links b/debian/_base/applications/koffice/debian/kugar-trinity.links
index 9a06b3e2f..9a06b3e2f 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.links
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.links
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian b/debian/_base/applications/koffice/debian/kugar-trinity.lintian
index a0cd38a78..a0cd38a78 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.manpages b/debian/_base/applications/koffice/debian/kugar-trinity.manpages
index 2a72a7d1b..2a72a7d1b 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.menu b/debian/_base/applications/koffice/debian/kugar-trinity.menu
index c378a94a1..c378a94a1 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.menu
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.mime b/debian/_base/applications/koffice/debian/kugar-trinity.mime
index f731d744f..f731d744f 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.mime
+++ b/debian/_base/applications/koffice/debian/kugar-trinity.mime
diff --git a/debian/squeeze/applications/koffice/debian/kugar.1 b/debian/_base/applications/koffice/debian/kugar.1
index c3903a3d1..c3903a3d1 100644
--- a/debian/squeeze/applications/koffice/debian/kugar.1
+++ b/debian/_base/applications/koffice/debian/kugar.1
diff --git a/debian/squeeze/applications/koffice/debian/kugar.xpm b/debian/_base/applications/koffice/debian/kugar.xpm
index ee5a5a9f6..ee5a5a9f6 100644
--- a/debian/squeeze/applications/koffice/debian/kugar.xpm
+++ b/debian/_base/applications/koffice/debian/kugar.xpm
diff --git a/debian/squeeze/applications/koffice/debian/kword-data-trinity.install b/debian/_base/applications/koffice/debian/kword-data-trinity.install
index 32f9e2f9c..32f9e2f9c 100644
--- a/debian/squeeze/applications/koffice/debian/kword-data-trinity.install
+++ b/debian/_base/applications/koffice/debian/kword-data-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kword-data-trinity.lintian b/debian/_base/applications/koffice/debian/kword-data-trinity.lintian
index 34a1f7f57..34a1f7f57 100644
--- a/debian/squeeze/applications/koffice/debian/kword-data-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kword-data-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.README.Debian b/debian/_base/applications/koffice/debian/kword-trinity.README.Debian
index 14ad609c3..14ad609c3 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.README.Debian
+++ b/debian/_base/applications/koffice/debian/kword-trinity.README.Debian
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.docs b/debian/_base/applications/koffice/debian/kword-trinity.docs
index 8c00bbf2b..8c00bbf2b 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.docs
+++ b/debian/_base/applications/koffice/debian/kword-trinity.docs
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.examples b/debian/_base/applications/koffice/debian/kword-trinity.examples
index 81458fe9f..81458fe9f 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.examples
+++ b/debian/_base/applications/koffice/debian/kword-trinity.examples
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.install b/debian/_base/applications/koffice/debian/kword-trinity.install
index d003812cd..d003812cd 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.install
+++ b/debian/_base/applications/koffice/debian/kword-trinity.install
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.lintian b/debian/_base/applications/koffice/debian/kword-trinity.lintian
index a187698f4..a187698f4 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.lintian
+++ b/debian/_base/applications/koffice/debian/kword-trinity.lintian
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.manpages b/debian/_base/applications/koffice/debian/kword-trinity.manpages
index a9bf36729..a9bf36729 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.manpages
+++ b/debian/_base/applications/koffice/debian/kword-trinity.manpages
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.menu b/debian/_base/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..2dfdc2579 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.menu
+++ b/debian/_base/applications/koffice/debian/kword-trinity.menu
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.mime b/debian/_base/applications/koffice/debian/kword-trinity.mime
index 026ac0d2b..026ac0d2b 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.mime
+++ b/debian/_base/applications/koffice/debian/kword-trinity.mime
diff --git a/debian/squeeze/applications/koffice/debian/kword.1 b/debian/_base/applications/koffice/debian/kword.1
index c191e2978..c191e2978 100644
--- a/debian/squeeze/applications/koffice/debian/kword.1
+++ b/debian/_base/applications/koffice/debian/kword.1
diff --git a/debian/squeeze/applications/koffice/debian/kword.xpm b/debian/_base/applications/koffice/debian/kword.xpm
index 38d4f830c..38d4f830c 100644
--- a/debian/squeeze/applications/koffice/debian/kword.xpm
+++ b/debian/_base/applications/koffice/debian/kword.xpm
diff --git a/debian/squeeze/applications/koffice/debian/not-installed.list b/debian/_base/applications/koffice/debian/not-installed.list
index de62d185f..de62d185f 100644
--- a/debian/squeeze/applications/koffice/debian/not-installed.list
+++ b/debian/_base/applications/koffice/debian/not-installed.list
diff --git a/debian/squeeze/applications/koffice/debian/patches/series b/debian/_base/applications/koffice/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/koffice/debian/patches/series
+++ b/debian/_base/applications/koffice/debian/patches/series
diff --git a/debian/squeeze/applications/koffice/debian/rules b/debian/_base/applications/koffice/debian/rules
index 372998f85..372998f85 100755
--- a/debian/squeeze/applications/koffice/debian/rules
+++ b/debian/_base/applications/koffice/debian/rules
diff --git a/debian/squeeze/applications/koffice/debian/source/format b/debian/_base/applications/koffice/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/koffice/debian/source/format
+++ b/debian/_base/applications/koffice/debian/source/format
diff --git a/debian/squeeze/applications/koffice/debian/source/options b/debian/_base/applications/koffice/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/koffice/debian/source/options
+++ b/debian/_base/applications/koffice/debian/source/options
diff --git a/debian/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/konversation/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/konversation/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/konversation/debian/cdbs/kde.mk b/debian/_base/applications/konversation/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/konversation/debian/cdbs/kde.mk
+++ b/debian/_base/applications/konversation/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/konversation/debian/cdbs/versions.pl b/debian/_base/applications/konversation/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/konversation/debian/cdbs/versions.pl
+++ b/debian/_base/applications/konversation/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/konversation/debian/changelog b/debian/_base/applications/konversation/debian/changelog
index bdb599f0f..bdb599f0f 100644
--- a/debian/squeeze/applications/konversation/debian/changelog
+++ b/debian/_base/applications/konversation/debian/changelog
diff --git a/debian/squeeze/applications/konversation/debian/compat b/debian/_base/applications/konversation/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/konversation/debian/compat
+++ b/debian/_base/applications/konversation/debian/compat
diff --git a/debian/squeeze/applications/konversation/debian/control b/debian/_base/applications/konversation/debian/control
index be952d05b..be952d05b 100644
--- a/debian/squeeze/applications/konversation/debian/control
+++ b/debian/_base/applications/konversation/debian/control
diff --git a/debian/squeeze/applications/konversation/debian/copyright b/debian/_base/applications/konversation/debian/copyright
index cb5c85c8e..cb5c85c8e 100644
--- a/debian/squeeze/applications/konversation/debian/copyright
+++ b/debian/_base/applications/konversation/debian/copyright
diff --git a/debian/squeeze/applications/konversation/debian/konversation-trinity.docs b/debian/_base/applications/konversation/debian/konversation-trinity.docs
index e7f450c0c..e7f450c0c 100644
--- a/debian/squeeze/applications/konversation/debian/konversation-trinity.docs
+++ b/debian/_base/applications/konversation/debian/konversation-trinity.docs
diff --git a/debian/squeeze/applications/konversation/debian/konversation-trinity.install b/debian/_base/applications/konversation/debian/konversation-trinity.install
index ca10af6cf..ca10af6cf 100644
--- a/debian/squeeze/applications/konversation/debian/konversation-trinity.install
+++ b/debian/_base/applications/konversation/debian/konversation-trinity.install
diff --git a/debian/squeeze/applications/konversation/debian/konversation-trinity.manpages b/debian/_base/applications/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..13cdaf4b2 100644
--- a/debian/squeeze/applications/konversation/debian/konversation-trinity.manpages
+++ b/debian/_base/applications/konversation/debian/konversation-trinity.manpages
diff --git a/debian/squeeze/applications/konversation/debian/konversation-trinity.menu b/debian/_base/applications/konversation/debian/konversation-trinity.menu
index 0fbd13937..0fbd13937 100644
--- a/debian/squeeze/applications/konversation/debian/konversation-trinity.menu
+++ b/debian/_base/applications/konversation/debian/konversation-trinity.menu
diff --git a/debian/squeeze/applications/konversation/debian/konversation16x16.xpm b/debian/_base/applications/konversation/debian/konversation16x16.xpm
index 4b4a9376c..4b4a9376c 100644
--- a/debian/squeeze/applications/konversation/debian/konversation16x16.xpm
+++ b/debian/_base/applications/konversation/debian/konversation16x16.xpm
diff --git a/debian/squeeze/applications/konversation/debian/konversation32x32.xpm b/debian/_base/applications/konversation/debian/konversation32x32.xpm
index 60c8f3b0c..60c8f3b0c 100644
--- a/debian/squeeze/applications/konversation/debian/konversation32x32.xpm
+++ b/debian/_base/applications/konversation/debian/konversation32x32.xpm
diff --git a/debian/squeeze/applications/konversation/debian/man/konversation.1.docbook b/debian/_base/applications/konversation/debian/man/konversation.1.docbook
index f48e27b95..f48e27b95 100644
--- a/debian/squeeze/applications/konversation/debian/man/konversation.1.docbook
+++ b/debian/_base/applications/konversation/debian/man/konversation.1.docbook
diff --git a/debian/squeeze/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/debian/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..1752d7b2c 100644
--- a/debian/squeeze/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/debian/_base/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
diff --git a/debian/squeeze/applications/konversation/debian/patches/.gitignore b/debian/_base/applications/konversation/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/konversation/debian/patches/.gitignore
+++ b/debian/_base/applications/konversation/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/konversation/debian/rules b/debian/_base/applications/konversation/debian/rules
index 61643f3ff..61643f3ff 100755
--- a/debian/squeeze/applications/konversation/debian/rules
+++ b/debian/_base/applications/konversation/debian/rules
diff --git a/debian/squeeze/applications/konversation/debian/source/format b/debian/_base/applications/konversation/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/konversation/debian/source/format
+++ b/debian/_base/applications/konversation/debian/source/format
diff --git a/debian/squeeze/applications/konversation/debian/source/options b/debian/_base/applications/konversation/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/konversation/debian/source/options
+++ b/debian/_base/applications/konversation/debian/source/options
diff --git a/debian/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk b/debian/_base/applications/kopete-otr/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kopete-otr/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kopete-otr/debian/cdbs/versions.pl b/debian/_base/applications/kopete-otr/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kopete-otr/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kopete-otr/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kopete-otr/debian/changelog b/debian/_base/applications/kopete-otr/debian/changelog
index f424502b9..f424502b9 100644
--- a/debian/squeeze/applications/kopete-otr/debian/changelog
+++ b/debian/_base/applications/kopete-otr/debian/changelog
diff --git a/debian/squeeze/applications/kopete-otr/debian/compat b/debian/_base/applications/kopete-otr/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kopete-otr/debian/compat
+++ b/debian/_base/applications/kopete-otr/debian/compat
diff --git a/debian/squeeze/applications/kopete-otr/debian/control b/debian/_base/applications/kopete-otr/debian/control
index 8a6cf46bc..8a6cf46bc 100644
--- a/debian/squeeze/applications/kopete-otr/debian/control
+++ b/debian/_base/applications/kopete-otr/debian/control
diff --git a/debian/squeeze/applications/kopete-otr/debian/copyright b/debian/_base/applications/kopete-otr/debian/copyright
index 86dcae02e..86dcae02e 100644
--- a/debian/squeeze/applications/kopete-otr/debian/copyright
+++ b/debian/_base/applications/kopete-otr/debian/copyright
diff --git a/debian/squeeze/applications/kopete-otr/debian/rules b/debian/_base/applications/kopete-otr/debian/rules
index 3c342bcfc..3c342bcfc 100755
--- a/debian/squeeze/applications/kopete-otr/debian/rules
+++ b/debian/_base/applications/kopete-otr/debian/rules
diff --git a/debian/squeeze/applications/kopete-otr/debian/source/format b/debian/_base/applications/kopete-otr/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kopete-otr/debian/source/format
+++ b/debian/_base/applications/kopete-otr/debian/source/format
diff --git a/debian/squeeze/applications/kopete-otr/debian/source/options b/debian/_base/applications/kopete-otr/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kopete-otr/debian/source/options
+++ b/debian/_base/applications/kopete-otr/debian/source/options
diff --git a/debian/squeeze/applications/kopete-otr/debian/watch b/debian/_base/applications/kopete-otr/debian/watch
index 50ddb75fa..50ddb75fa 100644
--- a/debian/squeeze/applications/kopete-otr/debian/watch
+++ b/debian/_base/applications/kopete-otr/debian/watch
diff --git a/debian/squeeze/applications/kpicosim/debian/Makefile.am b/debian/_base/applications/kpicosim/debian/Makefile.am
index 5de86e2c3..5de86e2c3 100644
--- a/debian/squeeze/applications/kpicosim/debian/Makefile.am
+++ b/debian/_base/applications/kpicosim/debian/Makefile.am
diff --git a/debian/squeeze/applications/kpicosim/debian/changelog b/debian/_base/applications/kpicosim/debian/changelog
index 5d239becc..5d239becc 100644
--- a/debian/squeeze/applications/kpicosim/debian/changelog
+++ b/debian/_base/applications/kpicosim/debian/changelog
diff --git a/debian/squeeze/applications/kpicosim/debian/compat b/debian/_base/applications/kpicosim/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kpicosim/debian/compat
+++ b/debian/_base/applications/kpicosim/debian/compat
diff --git a/debian/squeeze/applications/kpicosim/debian/control b/debian/_base/applications/kpicosim/debian/control
index bd70b1347..bd70b1347 100644
--- a/debian/squeeze/applications/kpicosim/debian/control
+++ b/debian/_base/applications/kpicosim/debian/control
diff --git a/debian/squeeze/applications/kpicosim/debian/copyright b/debian/_base/applications/kpicosim/debian/copyright
index 1e968a7a0..1e968a7a0 100644
--- a/debian/squeeze/applications/kpicosim/debian/copyright
+++ b/debian/_base/applications/kpicosim/debian/copyright
diff --git a/debian/squeeze/applications/kpicosim/debian/dirs b/debian/_base/applications/kpicosim/debian/dirs
index ca882bbb7..ca882bbb7 100644
--- a/debian/squeeze/applications/kpicosim/debian/dirs
+++ b/debian/_base/applications/kpicosim/debian/dirs
diff --git a/debian/squeeze/applications/kpicosim/debian/docs b/debian/_base/applications/kpicosim/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/debian/squeeze/applications/kpicosim/debian/docs
+++ b/debian/_base/applications/kpicosim/debian/docs
diff --git a/debian/squeeze/applications/kpicosim/debian/kpicosim-trinity.links b/debian/_base/applications/kpicosim/debian/kpicosim-trinity.links
index 78a8ee9df..78a8ee9df 100644
--- a/debian/squeeze/applications/kpicosim/debian/kpicosim-trinity.links
+++ b/debian/_base/applications/kpicosim/debian/kpicosim-trinity.links
diff --git a/debian/squeeze/applications/kpicosim/debian/kpicosim-trinity.manpages b/debian/_base/applications/kpicosim/debian/kpicosim-trinity.manpages
index 046bd32dd..046bd32dd 100644
--- a/debian/squeeze/applications/kpicosim/debian/kpicosim-trinity.manpages
+++ b/debian/_base/applications/kpicosim/debian/kpicosim-trinity.manpages
diff --git a/debian/squeeze/applications/kpicosim/debian/kpicosim.1 b/debian/_base/applications/kpicosim/debian/kpicosim.1
index 5557b20a8..5557b20a8 100644
--- a/debian/squeeze/applications/kpicosim/debian/kpicosim.1
+++ b/debian/_base/applications/kpicosim/debian/kpicosim.1
diff --git a/debian/squeeze/applications/kpicosim/debian/menu b/debian/_base/applications/kpicosim/debian/menu
index 12de54d49..12de54d49 100644
--- a/debian/squeeze/applications/kpicosim/debian/menu
+++ b/debian/_base/applications/kpicosim/debian/menu
diff --git a/debian/squeeze/applications/kpicosim/debian/rules b/debian/_base/applications/kpicosim/debian/rules
index 98b6ba69e..98b6ba69e 100755
--- a/debian/squeeze/applications/kpicosim/debian/rules
+++ b/debian/_base/applications/kpicosim/debian/rules
diff --git a/debian/squeeze/applications/kpicosim/debian/source/format b/debian/_base/applications/kpicosim/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kpicosim/debian/source/format
+++ b/debian/_base/applications/kpicosim/debian/source/format
diff --git a/debian/squeeze/applications/kpicosim/debian/source/options b/debian/_base/applications/kpicosim/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kpicosim/debian/source/options
+++ b/debian/_base/applications/kpicosim/debian/source/options
diff --git a/debian/squeeze/applications/kpicosim/debian/watch b/debian/_base/applications/kpicosim/debian/watch
index fc0a7c717..fc0a7c717 100644
--- a/debian/squeeze/applications/kpicosim/debian/watch
+++ b/debian/_base/applications/kpicosim/debian/watch
diff --git a/debian/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kpilot/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk b/debian/_base/applications/kpilot/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kpilot/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kpilot/debian/cdbs/versions.pl b/debian/_base/applications/kpilot/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kpilot/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kpilot/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kpilot/debian/changelog b/debian/_base/applications/kpilot/debian/changelog
index 033be0529..033be0529 100644
--- a/debian/squeeze/applications/kpilot/debian/changelog
+++ b/debian/_base/applications/kpilot/debian/changelog
diff --git a/debian/squeeze/applications/kpilot/debian/compat b/debian/_base/applications/kpilot/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kpilot/debian/compat
+++ b/debian/_base/applications/kpilot/debian/compat
diff --git a/debian/squeeze/applications/kpilot/debian/control b/debian/_base/applications/kpilot/debian/control
index f46458778..f46458778 100644
--- a/debian/squeeze/applications/kpilot/debian/control
+++ b/debian/_base/applications/kpilot/debian/control
diff --git a/debian/squeeze/applications/kpilot/debian/copyright b/debian/_base/applications/kpilot/debian/copyright
index 86dcae02e..86dcae02e 100644
--- a/debian/squeeze/applications/kpilot/debian/copyright
+++ b/debian/_base/applications/kpilot/debian/copyright
diff --git a/debian/squeeze/applications/kpilot/debian/rules b/debian/_base/applications/kpilot/debian/rules
index 3c342bcfc..3c342bcfc 100755
--- a/debian/squeeze/applications/kpilot/debian/rules
+++ b/debian/_base/applications/kpilot/debian/rules
diff --git a/debian/squeeze/applications/kpilot/debian/source/format b/debian/_base/applications/kpilot/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kpilot/debian/source/format
+++ b/debian/_base/applications/kpilot/debian/source/format
diff --git a/debian/squeeze/applications/kpilot/debian/source/options b/debian/_base/applications/kpilot/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kpilot/debian/source/options
+++ b/debian/_base/applications/kpilot/debian/source/options
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
index 2dff59226..2dff59226 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/kde.mk b/debian/_base/applications/kpowersave.cmake/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kpowersave.cmake/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/versions.pl b/debian/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/changelog b/debian/_base/applications/kpowersave.cmake/debian/changelog
index c23417124..c23417124 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/changelog
+++ b/debian/_base/applications/kpowersave.cmake/debian/changelog
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/compat b/debian/_base/applications/kpowersave.cmake/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/compat
+++ b/debian/_base/applications/kpowersave.cmake/debian/compat
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/control b/debian/_base/applications/kpowersave.cmake/debian/control
index b5aed9d71..b5aed9d71 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/control
+++ b/debian/_base/applications/kpowersave.cmake/debian/control
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/copyright b/debian/_base/applications/kpowersave.cmake/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/copyright
+++ b/debian/_base/applications/kpowersave.cmake/debian/copyright
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/install b/debian/_base/applications/kpowersave.cmake/debian/install
index 4a1194bd1..4a1194bd1 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/install
+++ b/debian/_base/applications/kpowersave.cmake/debian/install
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.linda b/debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
index 4d9818595..4d9818595 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
+++ b/debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index b0c32f61e..b0c32f61e 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/debian/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave.1 b/debian/_base/applications/kpowersave.cmake/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave.1
+++ b/debian/_base/applications/kpowersave.cmake/debian/kpowersave.1
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave.xpm b/debian/_base/applications/kpowersave.cmake/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave.xpm
+++ b/debian/_base/applications/kpowersave.cmake/debian/kpowersave.xpm
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/manpages b/debian/_base/applications/kpowersave.cmake/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/manpages
+++ b/debian/_base/applications/kpowersave.cmake/debian/manpages
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/menu b/debian/_base/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..6ae0f9833 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/menu
+++ b/debian/_base/applications/kpowersave.cmake/debian/menu
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/patches/series b/debian/_base/applications/kpowersave.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/patches/series
+++ b/debian/_base/applications/kpowersave.cmake/debian/patches/series
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/postrm b/debian/_base/applications/kpowersave.cmake/debian/postrm
index 4e8eda799..4e8eda799 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/postrm
+++ b/debian/_base/applications/kpowersave.cmake/debian/postrm
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/preinst b/debian/_base/applications/kpowersave.cmake/debian/preinst
index b007ccf90..b007ccf90 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/preinst
+++ b/debian/_base/applications/kpowersave.cmake/debian/preinst
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/rules b/debian/_base/applications/kpowersave.cmake/debian/rules
index f84c79ba9..f84c79ba9 100755
--- a/debian/squeeze/applications/kpowersave.cmake/debian/rules
+++ b/debian/_base/applications/kpowersave.cmake/debian/rules
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/source/format b/debian/_base/applications/kpowersave.cmake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/source/format
+++ b/debian/_base/applications/kpowersave.cmake/debian/source/format
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/source/options b/debian/_base/applications/kpowersave.cmake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/source/options
+++ b/debian/_base/applications/kpowersave.cmake/debian/source/options
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/watch b/debian/_base/applications/kpowersave.cmake/debian/watch
index 832285e63..832285e63 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/watch
+++ b/debian/_base/applications/kpowersave.cmake/debian/watch
diff --git a/debian/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk b/debian/_base/applications/kpowersave/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kpowersave/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kpowersave/debian/cdbs/versions.pl b/debian/_base/applications/kpowersave/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kpowersave/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kpowersave/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kpowersave/debian/changelog b/debian/_base/applications/kpowersave/debian/changelog
index d9b8099ef..d9b8099ef 100644
--- a/debian/squeeze/applications/kpowersave/debian/changelog
+++ b/debian/_base/applications/kpowersave/debian/changelog
diff --git a/debian/squeeze/applications/kpowersave/debian/compat b/debian/_base/applications/kpowersave/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kpowersave/debian/compat
+++ b/debian/_base/applications/kpowersave/debian/compat
diff --git a/debian/squeeze/applications/kpowersave/debian/control b/debian/_base/applications/kpowersave/debian/control
index 387a4ffd0..387a4ffd0 100644
--- a/debian/squeeze/applications/kpowersave/debian/control
+++ b/debian/_base/applications/kpowersave/debian/control
diff --git a/debian/squeeze/applications/kpowersave/debian/copyright b/debian/_base/applications/kpowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/debian/squeeze/applications/kpowersave/debian/copyright
+++ b/debian/_base/applications/kpowersave/debian/copyright
diff --git a/debian/squeeze/applications/kpowersave/debian/install b/debian/_base/applications/kpowersave/debian/install
index 7b00dd534..7b00dd534 100644
--- a/debian/squeeze/applications/kpowersave/debian/install
+++ b/debian/_base/applications/kpowersave/debian/install
diff --git a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda b/debian/_base/applications/kpowersave/debian/kpowersave-trinity.linda
index 652f468f2..652f468f2 100644
--- a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda
+++ b/debian/_base/applications/kpowersave/debian/kpowersave-trinity.linda
diff --git a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian b/debian/_base/applications/kpowersave/debian/kpowersave-trinity.lintian
index b0c32f61e..b0c32f61e 100644
--- a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/debian/_base/applications/kpowersave/debian/kpowersave-trinity.lintian
diff --git a/debian/squeeze/applications/kpowersave/debian/kpowersave.1 b/debian/_base/applications/kpowersave/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/debian/squeeze/applications/kpowersave/debian/kpowersave.1
+++ b/debian/_base/applications/kpowersave/debian/kpowersave.1
diff --git a/debian/squeeze/applications/kpowersave/debian/kpowersave.xpm b/debian/_base/applications/kpowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/debian/squeeze/applications/kpowersave/debian/kpowersave.xpm
+++ b/debian/_base/applications/kpowersave/debian/kpowersave.xpm
diff --git a/debian/squeeze/applications/kpowersave/debian/manpages b/debian/_base/applications/kpowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/debian/squeeze/applications/kpowersave/debian/manpages
+++ b/debian/_base/applications/kpowersave/debian/manpages
diff --git a/debian/squeeze/applications/kpowersave/debian/menu b/debian/_base/applications/kpowersave/debian/menu
index 0dbd62cc4..0dbd62cc4 100644
--- a/debian/squeeze/applications/kpowersave/debian/menu
+++ b/debian/_base/applications/kpowersave/debian/menu
diff --git a/debian/squeeze/applications/kpowersave/debian/patches/series b/debian/_base/applications/kpowersave/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kpowersave/debian/patches/series
+++ b/debian/_base/applications/kpowersave/debian/patches/series
diff --git a/debian/squeeze/applications/kpowersave/debian/postrm b/debian/_base/applications/kpowersave/debian/postrm
index 4e8eda799..4e8eda799 100644
--- a/debian/squeeze/applications/kpowersave/debian/postrm
+++ b/debian/_base/applications/kpowersave/debian/postrm
diff --git a/debian/squeeze/applications/kpowersave/debian/preinst b/debian/_base/applications/kpowersave/debian/preinst
index d0eb1227c..d0eb1227c 100644
--- a/debian/squeeze/applications/kpowersave/debian/preinst
+++ b/debian/_base/applications/kpowersave/debian/preinst
diff --git a/debian/squeeze/applications/kpowersave/debian/rules b/debian/_base/applications/kpowersave/debian/rules
index 1575fca96..1575fca96 100755
--- a/debian/squeeze/applications/kpowersave/debian/rules
+++ b/debian/_base/applications/kpowersave/debian/rules
diff --git a/debian/squeeze/applications/kpowersave/debian/source/format b/debian/_base/applications/kpowersave/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kpowersave/debian/source/format
+++ b/debian/_base/applications/kpowersave/debian/source/format
diff --git a/debian/squeeze/applications/kpowersave/debian/source/options b/debian/_base/applications/kpowersave/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kpowersave/debian/source/options
+++ b/debian/_base/applications/kpowersave/debian/source/options
diff --git a/debian/squeeze/applications/kpowersave/debian/watch b/debian/_base/applications/kpowersave/debian/watch
index 832285e63..832285e63 100644
--- a/debian/squeeze/applications/kpowersave/debian/watch
+++ b/debian/_base/applications/kpowersave/debian/watch
diff --git a/debian/squeeze/applications/kradio/debian/changelog b/debian/_base/applications/kradio/debian/changelog
index ad7c7832c..ad7c7832c 100644
--- a/debian/squeeze/applications/kradio/debian/changelog
+++ b/debian/_base/applications/kradio/debian/changelog
diff --git a/debian/squeeze/applications/kradio/debian/compat b/debian/_base/applications/kradio/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kradio/debian/compat
+++ b/debian/_base/applications/kradio/debian/compat
diff --git a/debian/squeeze/applications/kradio/debian/control b/debian/_base/applications/kradio/debian/control
index 25515173b..25515173b 100644
--- a/debian/squeeze/applications/kradio/debian/control
+++ b/debian/_base/applications/kradio/debian/control
diff --git a/debian/squeeze/applications/kradio/debian/convert-presets.1 b/debian/_base/applications/kradio/debian/convert-presets.1
index 1f605127f..1f605127f 100644
--- a/debian/squeeze/applications/kradio/debian/convert-presets.1
+++ b/debian/_base/applications/kradio/debian/convert-presets.1
diff --git a/debian/squeeze/applications/kradio/debian/copyright b/debian/_base/applications/kradio/debian/copyright
index 932ce3d04..932ce3d04 100644
--- a/debian/squeeze/applications/kradio/debian/copyright
+++ b/debian/_base/applications/kradio/debian/copyright
diff --git a/debian/squeeze/applications/kradio/debian/docs b/debian/_base/applications/kradio/debian/docs
index bc4a4e465..bc4a4e465 100644
--- a/debian/squeeze/applications/kradio/debian/docs
+++ b/debian/_base/applications/kradio/debian/docs
diff --git a/debian/squeeze/applications/kradio/debian/kradio.1 b/debian/_base/applications/kradio/debian/kradio.1
index 3b715d05d..3b715d05d 100644
--- a/debian/squeeze/applications/kradio/debian/kradio.1
+++ b/debian/_base/applications/kradio/debian/kradio.1
diff --git a/debian/squeeze/applications/kradio/debian/manpages b/debian/_base/applications/kradio/debian/manpages
index f37e7cfcf..f37e7cfcf 100644
--- a/debian/squeeze/applications/kradio/debian/manpages
+++ b/debian/_base/applications/kradio/debian/manpages
diff --git a/debian/squeeze/applications/kradio/debian/menu b/debian/_base/applications/kradio/debian/menu
index 9c29dc73c..9c29dc73c 100644
--- a/debian/squeeze/applications/kradio/debian/menu
+++ b/debian/_base/applications/kradio/debian/menu
diff --git a/debian/squeeze/applications/kradio/debian/rules b/debian/_base/applications/kradio/debian/rules
index f3c1f73d7..f3c1f73d7 100755
--- a/debian/squeeze/applications/kradio/debian/rules
+++ b/debian/_base/applications/kradio/debian/rules
diff --git a/debian/squeeze/applications/kradio/debian/source/format b/debian/_base/applications/kradio/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kradio/debian/source/format
+++ b/debian/_base/applications/kradio/debian/source/format
diff --git a/debian/squeeze/applications/kradio/debian/source/options b/debian/_base/applications/kradio/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kradio/debian/source/options
+++ b/debian/_base/applications/kradio/debian/source/options
diff --git a/debian/squeeze/applications/kradio/debian/watch b/debian/_base/applications/kradio/debian/watch
index 49f735f61..49f735f61 100644
--- a/debian/squeeze/applications/kradio/debian/watch
+++ b/debian/_base/applications/kradio/debian/watch
diff --git a/debian/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/krename/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/krename/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/krename/debian/cdbs/kde.mk b/debian/_base/applications/krename/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/krename/debian/cdbs/kde.mk
+++ b/debian/_base/applications/krename/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/krename/debian/cdbs/versions.pl b/debian/_base/applications/krename/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/krename/debian/cdbs/versions.pl
+++ b/debian/_base/applications/krename/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/krename/debian/changelog b/debian/_base/applications/krename/debian/changelog
index d574638b6..d574638b6 100644
--- a/debian/squeeze/applications/krename/debian/changelog
+++ b/debian/_base/applications/krename/debian/changelog
diff --git a/debian/squeeze/applications/krename/debian/compat b/debian/_base/applications/krename/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/krename/debian/compat
+++ b/debian/_base/applications/krename/debian/compat
diff --git a/debian/squeeze/applications/krename/debian/control b/debian/_base/applications/krename/debian/control
index a05fa0309..a05fa0309 100644
--- a/debian/squeeze/applications/krename/debian/control
+++ b/debian/_base/applications/krename/debian/control
diff --git a/debian/squeeze/applications/krename/debian/copyright b/debian/_base/applications/krename/debian/copyright
index e90f32cab..e90f32cab 100644
--- a/debian/squeeze/applications/krename/debian/copyright
+++ b/debian/_base/applications/krename/debian/copyright
diff --git a/debian/squeeze/applications/krename/debian/docs b/debian/_base/applications/krename/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/krename/debian/docs
+++ b/debian/_base/applications/krename/debian/docs
diff --git a/debian/squeeze/applications/krename/debian/krename.1 b/debian/_base/applications/krename/debian/krename.1
index 153c74797..153c74797 100644
--- a/debian/squeeze/applications/krename/debian/krename.1
+++ b/debian/_base/applications/krename/debian/krename.1
diff --git a/debian/squeeze/applications/krename/debian/krename.manpages b/debian/_base/applications/krename/debian/krename.manpages
index ded8f6473..ded8f6473 100644
--- a/debian/squeeze/applications/krename/debian/krename.manpages
+++ b/debian/_base/applications/krename/debian/krename.manpages
diff --git a/debian/squeeze/applications/krename/debian/patches/series b/debian/_base/applications/krename/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/krename/debian/patches/series
+++ b/debian/_base/applications/krename/debian/patches/series
diff --git a/debian/squeeze/applications/krename/debian/rules b/debian/_base/applications/krename/debian/rules
index 404787210..404787210 100755
--- a/debian/squeeze/applications/krename/debian/rules
+++ b/debian/_base/applications/krename/debian/rules
diff --git a/debian/squeeze/applications/krename/debian/source/format b/debian/_base/applications/krename/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/krename/debian/source/format
+++ b/debian/_base/applications/krename/debian/source/format
diff --git a/debian/squeeze/applications/krename/debian/source/options b/debian/_base/applications/krename/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/krename/debian/source/options
+++ b/debian/_base/applications/krename/debian/source/options
diff --git a/debian/squeeze/applications/krename/debian/watch b/debian/_base/applications/krename/debian/watch
index 47a31479a..47a31479a 100644
--- a/debian/squeeze/applications/krename/debian/watch
+++ b/debian/_base/applications/krename/debian/watch
diff --git a/debian/squeeze/applications/krusader/debian/README.Debian b/debian/_base/applications/krusader/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/squeeze/applications/krusader/debian/README.Debian
+++ b/debian/_base/applications/krusader/debian/README.Debian
diff --git a/debian/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/krusader/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/krusader/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/krusader/debian/cdbs/kde.mk b/debian/_base/applications/krusader/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/krusader/debian/cdbs/kde.mk
+++ b/debian/_base/applications/krusader/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/krusader/debian/cdbs/versions.pl b/debian/_base/applications/krusader/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/krusader/debian/cdbs/versions.pl
+++ b/debian/_base/applications/krusader/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/krusader/debian/changelog b/debian/_base/applications/krusader/debian/changelog
index 33154f756..33154f756 100644
--- a/debian/squeeze/applications/krusader/debian/changelog
+++ b/debian/_base/applications/krusader/debian/changelog
diff --git a/debian/squeeze/applications/krusader/debian/compat b/debian/_base/applications/krusader/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/krusader/debian/compat
+++ b/debian/_base/applications/krusader/debian/compat
diff --git a/debian/squeeze/applications/krusader/debian/control b/debian/_base/applications/krusader/debian/control
index 2097f5451..2097f5451 100644
--- a/debian/squeeze/applications/krusader/debian/control
+++ b/debian/_base/applications/krusader/debian/control
diff --git a/debian/squeeze/applications/krusader/debian/copyright b/debian/_base/applications/krusader/debian/copyright
index 127bd8f63..127bd8f63 100644
--- a/debian/squeeze/applications/krusader/debian/copyright
+++ b/debian/_base/applications/krusader/debian/copyright
diff --git a/debian/squeeze/applications/krusader/debian/docs b/debian/_base/applications/krusader/debian/docs
index 623fe2da9..623fe2da9 100644
--- a/debian/squeeze/applications/krusader/debian/docs
+++ b/debian/_base/applications/krusader/debian/docs
diff --git a/debian/squeeze/applications/krusader/debian/krusader.lintian-overrides b/debian/_base/applications/krusader/debian/krusader.lintian-overrides
index ab5986658..ab5986658 100644
--- a/debian/squeeze/applications/krusader/debian/krusader.lintian-overrides
+++ b/debian/_base/applications/krusader/debian/krusader.lintian-overrides
diff --git a/debian/squeeze/applications/krusader/debian/menu b/debian/_base/applications/krusader/debian/menu
index 92d07892f..92d07892f 100644
--- a/debian/squeeze/applications/krusader/debian/menu
+++ b/debian/_base/applications/krusader/debian/menu
diff --git a/debian/squeeze/applications/krusader/debian/patches/series b/debian/_base/applications/krusader/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/krusader/debian/patches/series
+++ b/debian/_base/applications/krusader/debian/patches/series
diff --git a/debian/squeeze/applications/krusader/debian/rules b/debian/_base/applications/krusader/debian/rules
index eb772b614..eb772b614 100755
--- a/debian/squeeze/applications/krusader/debian/rules
+++ b/debian/_base/applications/krusader/debian/rules
diff --git a/debian/squeeze/applications/krusader/debian/source.lintian-overrides b/debian/_base/applications/krusader/debian/source.lintian-overrides
index 01d57f16c..01d57f16c 100644
--- a/debian/squeeze/applications/krusader/debian/source.lintian-overrides
+++ b/debian/_base/applications/krusader/debian/source.lintian-overrides
diff --git a/debian/squeeze/applications/krusader/debian/source/format b/debian/_base/applications/krusader/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/krusader/debian/source/format
+++ b/debian/_base/applications/krusader/debian/source/format
diff --git a/debian/squeeze/applications/krusader/debian/source/options b/debian/_base/applications/krusader/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/krusader/debian/source/options
+++ b/debian/_base/applications/krusader/debian/source/options
diff --git a/debian/squeeze/applications/krusader/debian/watch b/debian/_base/applications/krusader/debian/watch
index d19bef39d..d19bef39d 100644
--- a/debian/squeeze/applications/krusader/debian/watch
+++ b/debian/_base/applications/krusader/debian/watch
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog b/debian/_base/applications/ksplash-engine-moodin/debian/changelog
index 690318477..690318477 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/changelog
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/changelog
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/compat b/debian/_base/applications/ksplash-engine-moodin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/compat
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/compat
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/control b/debian/_base/applications/ksplash-engine-moodin/debian/control
index fb3ee17f8..fb3ee17f8 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/control
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/control
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/copyright b/debian/_base/applications/ksplash-engine-moodin/debian/copyright
index 087e70775..087e70775 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/copyright
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/copyright
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs b/debian/_base/applications/ksplash-engine-moodin/debian/debiandirs
index 0e561941d..0e561941d 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/debiandirs
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/dirs b/debian/_base/applications/ksplash-engine-moodin/debian/dirs
index 29183d0bc..29183d0bc 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/dirs
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/dirs
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/patches/.gitignore b/debian/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/patches/.gitignore
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules b/debian/_base/applications/ksplash-engine-moodin/debian/rules
index 2e7053e8b..2e7053e8b 100755
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/rules
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/source/format b/debian/_base/applications/ksplash-engine-moodin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/source/format
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/source/format
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/source/options b/debian/_base/applications/ksplash-engine-moodin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/source/options
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/source/options
diff --git a/debian/squeeze/applications/ksquirrel/debian/README.debian b/debian/_base/applications/ksquirrel/debian/README.debian
index 7c478322f..7c478322f 100644
--- a/debian/squeeze/applications/ksquirrel/debian/README.debian
+++ b/debian/_base/applications/ksquirrel/debian/README.debian
diff --git a/debian/squeeze/applications/ksquirrel/debian/changelog b/debian/_base/applications/ksquirrel/debian/changelog
index 8f786a231..8f786a231 100644
--- a/debian/squeeze/applications/ksquirrel/debian/changelog
+++ b/debian/_base/applications/ksquirrel/debian/changelog
diff --git a/debian/squeeze/applications/ksquirrel/debian/compat b/debian/_base/applications/ksquirrel/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/ksquirrel/debian/compat
+++ b/debian/_base/applications/ksquirrel/debian/compat
diff --git a/debian/squeeze/applications/ksquirrel/debian/control b/debian/_base/applications/ksquirrel/debian/control
index 59466b140..59466b140 100644
--- a/debian/squeeze/applications/ksquirrel/debian/control
+++ b/debian/_base/applications/ksquirrel/debian/control
diff --git a/debian/squeeze/applications/ksquirrel/debian/copyright b/debian/_base/applications/ksquirrel/debian/copyright
index d09bb9228..d09bb9228 100644
--- a/debian/squeeze/applications/ksquirrel/debian/copyright
+++ b/debian/_base/applications/ksquirrel/debian/copyright
diff --git a/debian/squeeze/applications/ksquirrel/debian/docs b/debian/_base/applications/ksquirrel/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/ksquirrel/debian/docs
+++ b/debian/_base/applications/ksquirrel/debian/docs
diff --git a/debian/squeeze/applications/ksquirrel/debian/ksquirrel-libs-configurator.1 b/debian/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
index a6da62b4c..a6da62b4c 100644
--- a/debian/squeeze/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
+++ b/debian/_base/applications/ksquirrel/debian/ksquirrel-libs-configurator.1
diff --git a/debian/squeeze/applications/ksquirrel/debian/patches/.gitignore b/debian/_base/applications/ksquirrel/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/ksquirrel/debian/patches/.gitignore
+++ b/debian/_base/applications/ksquirrel/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/ksquirrel/debian/rules b/debian/_base/applications/ksquirrel/debian/rules
index a291256f6..a291256f6 100755
--- a/debian/squeeze/applications/ksquirrel/debian/rules
+++ b/debian/_base/applications/ksquirrel/debian/rules
diff --git a/debian/squeeze/applications/ksquirrel/debian/source/format b/debian/_base/applications/ksquirrel/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/ksquirrel/debian/source/format
+++ b/debian/_base/applications/ksquirrel/debian/source/format
diff --git a/debian/squeeze/applications/ksquirrel/debian/source/options b/debian/_base/applications/ksquirrel/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/ksquirrel/debian/source/options
+++ b/debian/_base/applications/ksquirrel/debian/source/options
diff --git a/debian/squeeze/applications/ksquirrel/debian/watch b/debian/_base/applications/ksquirrel/debian/watch
index a276799ff..a276799ff 100644
--- a/debian/squeeze/applications/ksquirrel/debian/watch
+++ b/debian/_base/applications/ksquirrel/debian/watch
diff --git a/debian/squeeze/applications/kstreamripper/debian/README.Debian-source b/debian/_base/applications/kstreamripper/debian/README.Debian-source
index 57547ac25..57547ac25 100644
--- a/debian/squeeze/applications/kstreamripper/debian/README.Debian-source
+++ b/debian/_base/applications/kstreamripper/debian/README.Debian-source
diff --git a/debian/squeeze/applications/kstreamripper/debian/changelog b/debian/_base/applications/kstreamripper/debian/changelog
index 7e7fdb95b..7e7fdb95b 100644
--- a/debian/squeeze/applications/kstreamripper/debian/changelog
+++ b/debian/_base/applications/kstreamripper/debian/changelog
diff --git a/debian/squeeze/applications/kstreamripper/debian/compat b/debian/_base/applications/kstreamripper/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kstreamripper/debian/compat
+++ b/debian/_base/applications/kstreamripper/debian/compat
diff --git a/debian/squeeze/applications/kstreamripper/debian/control b/debian/_base/applications/kstreamripper/debian/control
index 8ac3fab61..8ac3fab61 100644
--- a/debian/squeeze/applications/kstreamripper/debian/control
+++ b/debian/_base/applications/kstreamripper/debian/control
diff --git a/debian/squeeze/applications/kstreamripper/debian/copyright b/debian/_base/applications/kstreamripper/debian/copyright
index 61d405298..61d405298 100644
--- a/debian/squeeze/applications/kstreamripper/debian/copyright
+++ b/debian/_base/applications/kstreamripper/debian/copyright
diff --git a/debian/squeeze/applications/kstreamripper/debian/dirs b/debian/_base/applications/kstreamripper/debian/dirs
index a59ccc8af..a59ccc8af 100644
--- a/debian/squeeze/applications/kstreamripper/debian/dirs
+++ b/debian/_base/applications/kstreamripper/debian/dirs
diff --git a/debian/squeeze/applications/kstreamripper/debian/docs b/debian/_base/applications/kstreamripper/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/kstreamripper/debian/docs
+++ b/debian/_base/applications/kstreamripper/debian/docs
diff --git a/debian/squeeze/applications/kstreamripper/debian/kstreamripper-trinity.install b/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.install
index dc292dbda..dc292dbda 100644
--- a/debian/squeeze/applications/kstreamripper/debian/kstreamripper-trinity.install
+++ b/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.install
diff --git a/debian/squeeze/applications/kstreamripper/debian/kstreamripper-trinity.postinst b/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst
index f5542ab64..f5542ab64 100644
--- a/debian/squeeze/applications/kstreamripper/debian/kstreamripper-trinity.postinst
+++ b/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postinst
diff --git a/debian/squeeze/applications/kstreamripper/debian/kstreamripper-trinity.postrm b/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm
index 5209bcb38..5209bcb38 100644
--- a/debian/squeeze/applications/kstreamripper/debian/kstreamripper-trinity.postrm
+++ b/debian/_base/applications/kstreamripper/debian/kstreamripper-trinity.postrm
diff --git a/debian/squeeze/applications/kstreamripper/debian/kstreamripper.1 b/debian/_base/applications/kstreamripper/debian/kstreamripper.1
index b409a6be0..b409a6be0 100644
--- a/debian/squeeze/applications/kstreamripper/debian/kstreamripper.1
+++ b/debian/_base/applications/kstreamripper/debian/kstreamripper.1
diff --git a/debian/squeeze/applications/kstreamripper/debian/kstreamripper.desktop b/debian/_base/applications/kstreamripper/debian/kstreamripper.desktop
index a0c155fac..a0c155fac 100644
--- a/debian/squeeze/applications/kstreamripper/debian/kstreamripper.desktop
+++ b/debian/_base/applications/kstreamripper/debian/kstreamripper.desktop
diff --git a/debian/squeeze/applications/kstreamripper/debian/kstreamripper.menu b/debian/_base/applications/kstreamripper/debian/kstreamripper.menu
index 9ae6cbe73..9ae6cbe73 100644
--- a/debian/squeeze/applications/kstreamripper/debian/kstreamripper.menu
+++ b/debian/_base/applications/kstreamripper/debian/kstreamripper.menu
diff --git a/debian/squeeze/applications/kstreamripper/debian/rules b/debian/_base/applications/kstreamripper/debian/rules
index cb9dc49ae..cb9dc49ae 100755
--- a/debian/squeeze/applications/kstreamripper/debian/rules
+++ b/debian/_base/applications/kstreamripper/debian/rules
diff --git a/debian/squeeze/applications/kstreamripper/debian/source/format b/debian/_base/applications/kstreamripper/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kstreamripper/debian/source/format
+++ b/debian/_base/applications/kstreamripper/debian/source/format
diff --git a/debian/squeeze/applications/kstreamripper/debian/source/options b/debian/_base/applications/kstreamripper/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kstreamripper/debian/source/options
+++ b/debian/_base/applications/kstreamripper/debian/source/options
diff --git a/debian/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk b/debian/_base/applications/ksystemlog/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk
+++ b/debian/_base/applications/ksystemlog/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/ksystemlog/debian/cdbs/versions.pl b/debian/_base/applications/ksystemlog/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/ksystemlog/debian/cdbs/versions.pl
+++ b/debian/_base/applications/ksystemlog/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/ksystemlog/debian/changelog b/debian/_base/applications/ksystemlog/debian/changelog
index d067e585b..d067e585b 100644
--- a/debian/squeeze/applications/ksystemlog/debian/changelog
+++ b/debian/_base/applications/ksystemlog/debian/changelog
diff --git a/debian/squeeze/applications/ksystemlog/debian/compat b/debian/_base/applications/ksystemlog/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/ksystemlog/debian/compat
+++ b/debian/_base/applications/ksystemlog/debian/compat
diff --git a/debian/squeeze/applications/ksystemlog/debian/control b/debian/_base/applications/ksystemlog/debian/control
index e5cd48aa9..e5cd48aa9 100644
--- a/debian/squeeze/applications/ksystemlog/debian/control
+++ b/debian/_base/applications/ksystemlog/debian/control
diff --git a/debian/squeeze/applications/ksystemlog/debian/copyright b/debian/_base/applications/ksystemlog/debian/copyright
index 0aac949f5..0aac949f5 100644
--- a/debian/squeeze/applications/ksystemlog/debian/copyright
+++ b/debian/_base/applications/ksystemlog/debian/copyright
diff --git a/debian/squeeze/applications/ksystemlog/debian/docs b/debian/_base/applications/ksystemlog/debian/docs
index 5502ed8f4..5502ed8f4 100644
--- a/debian/squeeze/applications/ksystemlog/debian/docs
+++ b/debian/_base/applications/ksystemlog/debian/docs
diff --git a/debian/squeeze/applications/ksystemlog/debian/ksystemlog.xml b/debian/_base/applications/ksystemlog/debian/ksystemlog.xml
index f412afcd4..f412afcd4 100644
--- a/debian/squeeze/applications/ksystemlog/debian/ksystemlog.xml
+++ b/debian/_base/applications/ksystemlog/debian/ksystemlog.xml
diff --git a/debian/squeeze/applications/ksystemlog/debian/menu b/debian/_base/applications/ksystemlog/debian/menu
index 57aa688f9..57aa688f9 100644
--- a/debian/squeeze/applications/ksystemlog/debian/menu
+++ b/debian/_base/applications/ksystemlog/debian/menu
diff --git a/debian/squeeze/applications/ksystemlog/debian/patches/series b/debian/_base/applications/ksystemlog/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/ksystemlog/debian/patches/series
+++ b/debian/_base/applications/ksystemlog/debian/patches/series
diff --git a/debian/squeeze/applications/ksystemlog/debian/rules b/debian/_base/applications/ksystemlog/debian/rules
index 2ba30f9a0..2ba30f9a0 100755
--- a/debian/squeeze/applications/ksystemlog/debian/rules
+++ b/debian/_base/applications/ksystemlog/debian/rules
diff --git a/debian/squeeze/applications/ksystemlog/debian/source/format b/debian/_base/applications/ksystemlog/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/ksystemlog/debian/source/format
+++ b/debian/_base/applications/ksystemlog/debian/source/format
diff --git a/debian/squeeze/applications/ksystemlog/debian/source/options b/debian/_base/applications/ksystemlog/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/ksystemlog/debian/source/options
+++ b/debian/_base/applications/ksystemlog/debian/source/options
diff --git a/debian/squeeze/applications/ksystemlog/debian/watch b/debian/_base/applications/ksystemlog/debian/watch
index b15cf467b..b15cf467b 100644
--- a/debian/squeeze/applications/ksystemlog/debian/watch
+++ b/debian/_base/applications/ksystemlog/debian/watch
diff --git a/debian/squeeze/applications/ktechlab/debian/changelog b/debian/_base/applications/ktechlab/debian/changelog
index 283fadf39..283fadf39 100644
--- a/debian/squeeze/applications/ktechlab/debian/changelog
+++ b/debian/_base/applications/ktechlab/debian/changelog
diff --git a/debian/squeeze/applications/ktechlab/debian/compat b/debian/_base/applications/ktechlab/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/ktechlab/debian/compat
+++ b/debian/_base/applications/ktechlab/debian/compat
diff --git a/debian/squeeze/applications/ktechlab/debian/control b/debian/_base/applications/ktechlab/debian/control
index a65c796eb..a65c796eb 100644
--- a/debian/squeeze/applications/ktechlab/debian/control
+++ b/debian/_base/applications/ktechlab/debian/control
diff --git a/debian/squeeze/applications/ktechlab/debian/copyright b/debian/_base/applications/ktechlab/debian/copyright
index 5b1af8a2e..5b1af8a2e 100644
--- a/debian/squeeze/applications/ktechlab/debian/copyright
+++ b/debian/_base/applications/ktechlab/debian/copyright
diff --git a/debian/squeeze/applications/ktechlab/debian/debiandirs b/debian/_base/applications/ktechlab/debian/debiandirs
index 2b39b1c4e..2b39b1c4e 100644
--- a/debian/squeeze/applications/ktechlab/debian/debiandirs
+++ b/debian/_base/applications/ktechlab/debian/debiandirs
diff --git a/debian/squeeze/applications/ktechlab/debian/docs b/debian/_base/applications/ktechlab/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/ktechlab/debian/docs
+++ b/debian/_base/applications/ktechlab/debian/docs
diff --git a/debian/squeeze/applications/ktechlab/debian/ktechlab.1 b/debian/_base/applications/ktechlab/debian/ktechlab.1
index 226deb2e6..226deb2e6 100644
--- a/debian/squeeze/applications/ktechlab/debian/ktechlab.1
+++ b/debian/_base/applications/ktechlab/debian/ktechlab.1
diff --git a/debian/squeeze/applications/ktechlab/debian/manpages b/debian/_base/applications/ktechlab/debian/manpages
index ae17eaa94..ae17eaa94 100644
--- a/debian/squeeze/applications/ktechlab/debian/manpages
+++ b/debian/_base/applications/ktechlab/debian/manpages
diff --git a/debian/squeeze/applications/ktechlab/debian/menu b/debian/_base/applications/ktechlab/debian/menu
index 8d468de83..8d468de83 100644
--- a/debian/squeeze/applications/ktechlab/debian/menu
+++ b/debian/_base/applications/ktechlab/debian/menu
diff --git a/debian/squeeze/applications/ktechlab/debian/microbe.1 b/debian/_base/applications/ktechlab/debian/microbe.1
index ad4ae5ec0..ad4ae5ec0 100644
--- a/debian/squeeze/applications/ktechlab/debian/microbe.1
+++ b/debian/_base/applications/ktechlab/debian/microbe.1
diff --git a/debian/squeeze/applications/ktechlab/debian/patches/.gitignore b/debian/_base/applications/ktechlab/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/ktechlab/debian/patches/.gitignore
+++ b/debian/_base/applications/ktechlab/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/ktechlab/debian/rules b/debian/_base/applications/ktechlab/debian/rules
index 6ee5ee935..6ee5ee935 100755
--- a/debian/squeeze/applications/ktechlab/debian/rules
+++ b/debian/_base/applications/ktechlab/debian/rules
diff --git a/debian/squeeze/applications/ktechlab/debian/source/format b/debian/_base/applications/ktechlab/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/ktechlab/debian/source/format
+++ b/debian/_base/applications/ktechlab/debian/source/format
diff --git a/debian/squeeze/applications/ktechlab/debian/source/options b/debian/_base/applications/ktechlab/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/ktechlab/debian/source/options
+++ b/debian/_base/applications/ktechlab/debian/source/options
diff --git a/debian/squeeze/applications/ktorrent/debian/README.Debian b/debian/_base/applications/ktorrent/debian/README.Debian
index 0d4e3f758..0d4e3f758 100644
--- a/debian/squeeze/applications/ktorrent/debian/README.Debian
+++ b/debian/_base/applications/ktorrent/debian/README.Debian
diff --git a/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index cdfe0a8ea..cdfe0a8ea 100644
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk b/debian/_base/applications/ktorrent/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk
+++ b/debian/_base/applications/ktorrent/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/ktorrent/debian/cdbs/versions.pl b/debian/_base/applications/ktorrent/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/versions.pl
+++ b/debian/_base/applications/ktorrent/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/ktorrent/debian/changelog b/debian/_base/applications/ktorrent/debian/changelog
index a82f9b70b..a82f9b70b 100644
--- a/debian/squeeze/applications/ktorrent/debian/changelog
+++ b/debian/_base/applications/ktorrent/debian/changelog
diff --git a/debian/squeeze/applications/ktorrent/debian/compat b/debian/_base/applications/ktorrent/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/ktorrent/debian/compat
+++ b/debian/_base/applications/ktorrent/debian/compat
diff --git a/debian/squeeze/applications/ktorrent/debian/control b/debian/_base/applications/ktorrent/debian/control
index c19d8c957..c19d8c957 100644
--- a/debian/squeeze/applications/ktorrent/debian/control
+++ b/debian/_base/applications/ktorrent/debian/control
diff --git a/debian/squeeze/applications/ktorrent/debian/copyright b/debian/_base/applications/ktorrent/debian/copyright
index 9b8756613..9b8756613 100644
--- a/debian/squeeze/applications/ktorrent/debian/copyright
+++ b/debian/_base/applications/ktorrent/debian/copyright
diff --git a/debian/squeeze/applications/ktorrent/debian/ktorrent.1.docbook b/debian/_base/applications/ktorrent/debian/ktorrent.1.docbook
index f9b49424b..f9b49424b 100644
--- a/debian/squeeze/applications/ktorrent/debian/ktorrent.1.docbook
+++ b/debian/_base/applications/ktorrent/debian/ktorrent.1.docbook
diff --git a/debian/squeeze/applications/ktorrent/debian/patches/series b/debian/_base/applications/ktorrent/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/ktorrent/debian/patches/series
+++ b/debian/_base/applications/ktorrent/debian/patches/series
diff --git a/debian/squeeze/applications/ktorrent/debian/rules b/debian/_base/applications/ktorrent/debian/rules
index df3bef893..df3bef893 100755
--- a/debian/squeeze/applications/ktorrent/debian/rules
+++ b/debian/_base/applications/ktorrent/debian/rules
diff --git a/debian/squeeze/applications/ktorrent/debian/source/format b/debian/_base/applications/ktorrent/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/ktorrent/debian/source/format
+++ b/debian/_base/applications/ktorrent/debian/source/format
diff --git a/debian/squeeze/applications/ktorrent/debian/source/options b/debian/_base/applications/ktorrent/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/ktorrent/debian/source/options
+++ b/debian/_base/applications/ktorrent/debian/source/options
diff --git a/debian/squeeze/applications/ktorrent/debian/watch b/debian/_base/applications/ktorrent/debian/watch
index 0262eb3c5..0262eb3c5 100644
--- a/debian/squeeze/applications/ktorrent/debian/watch
+++ b/debian/_base/applications/ktorrent/debian/watch
diff --git a/debian/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk b/debian/_base/applications/kuickshow/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kuickshow/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kuickshow/debian/cdbs/versions.pl b/debian/_base/applications/kuickshow/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kuickshow/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kuickshow/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kuickshow/debian/changelog b/debian/_base/applications/kuickshow/debian/changelog
index c156cee8b..c156cee8b 100644
--- a/debian/squeeze/applications/kuickshow/debian/changelog
+++ b/debian/_base/applications/kuickshow/debian/changelog
diff --git a/debian/squeeze/applications/kuickshow/debian/compat b/debian/_base/applications/kuickshow/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kuickshow/debian/compat
+++ b/debian/_base/applications/kuickshow/debian/compat
diff --git a/debian/squeeze/applications/kuickshow/debian/control b/debian/_base/applications/kuickshow/debian/control
index 4bf58eaf7..4bf58eaf7 100644
--- a/debian/squeeze/applications/kuickshow/debian/control
+++ b/debian/_base/applications/kuickshow/debian/control
diff --git a/debian/squeeze/applications/kuickshow/debian/copyright b/debian/_base/applications/kuickshow/debian/copyright
index 2373ec1a7..2373ec1a7 100644
--- a/debian/squeeze/applications/kuickshow/debian/copyright
+++ b/debian/_base/applications/kuickshow/debian/copyright
diff --git a/debian/squeeze/applications/kuickshow/debian/icons/kuickshow-16.xpm b/debian/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/debian/squeeze/applications/kuickshow/debian/icons/kuickshow-16.xpm
+++ b/debian/_base/applications/kuickshow/debian/icons/kuickshow-16.xpm
diff --git a/debian/squeeze/applications/kuickshow/debian/icons/kuickshow.xpm b/debian/_base/applications/kuickshow/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/debian/squeeze/applications/kuickshow/debian/icons/kuickshow.xpm
+++ b/debian/_base/applications/kuickshow/debian/icons/kuickshow.xpm
diff --git a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.install b/debian/_base/applications/kuickshow/debian/kuickshow-trinity.install
index dee09fb33..dee09fb33 100644
--- a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.install
+++ b/debian/_base/applications/kuickshow/debian/kuickshow-trinity.install
diff --git a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.lintian b/debian/_base/applications/kuickshow/debian/kuickshow-trinity.lintian
index dd274dba5..dd274dba5 100644
--- a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.lintian
+++ b/debian/_base/applications/kuickshow/debian/kuickshow-trinity.lintian
diff --git a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.manpages b/debian/_base/applications/kuickshow/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.manpages
+++ b/debian/_base/applications/kuickshow/debian/kuickshow-trinity.manpages
diff --git a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/_base/applications/kuickshow/debian/kuickshow-trinity.menu
index 4d17d621c..4d17d621c 100644
--- a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/debian/_base/applications/kuickshow/debian/kuickshow-trinity.menu
diff --git a/debian/squeeze/applications/kuickshow/debian/man/kuickshow.1 b/debian/_base/applications/kuickshow/debian/man/kuickshow.1
index 2675eae4e..2675eae4e 100644
--- a/debian/squeeze/applications/kuickshow/debian/man/kuickshow.1
+++ b/debian/_base/applications/kuickshow/debian/man/kuickshow.1
diff --git a/debian/squeeze/applications/kuickshow/debian/patches/series b/debian/_base/applications/kuickshow/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kuickshow/debian/patches/series
+++ b/debian/_base/applications/kuickshow/debian/patches/series
diff --git a/debian/squeeze/applications/kuickshow/debian/rules b/debian/_base/applications/kuickshow/debian/rules
index e8c53e5db..e8c53e5db 100755
--- a/debian/squeeze/applications/kuickshow/debian/rules
+++ b/debian/_base/applications/kuickshow/debian/rules
diff --git a/debian/squeeze/applications/kuickshow/debian/source/format b/debian/_base/applications/kuickshow/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kuickshow/debian/source/format
+++ b/debian/_base/applications/kuickshow/debian/source/format
diff --git a/debian/squeeze/applications/kuickshow/debian/source/options b/debian/_base/applications/kuickshow/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kuickshow/debian/source/options
+++ b/debian/_base/applications/kuickshow/debian/source/options
diff --git a/debian/squeeze/applications/kvirc/debian/changelog b/debian/_base/applications/kvirc/debian/changelog
index 889d5878f..889d5878f 100644
--- a/debian/squeeze/applications/kvirc/debian/changelog
+++ b/debian/_base/applications/kvirc/debian/changelog
diff --git a/debian/squeeze/applications/kvirc/debian/compat b/debian/_base/applications/kvirc/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kvirc/debian/compat
+++ b/debian/_base/applications/kvirc/debian/compat
diff --git a/debian/squeeze/applications/kvirc/debian/control b/debian/_base/applications/kvirc/debian/control
index 8eecf6292..8eecf6292 100644
--- a/debian/squeeze/applications/kvirc/debian/control
+++ b/debian/_base/applications/kvirc/debian/control
diff --git a/debian/squeeze/applications/kvirc/debian/copyright b/debian/_base/applications/kvirc/debian/copyright
index 3f6f5b6e5..3f6f5b6e5 100644
--- a/debian/squeeze/applications/kvirc/debian/copyright
+++ b/debian/_base/applications/kvirc/debian/copyright
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.install b/debian/_base/applications/kvirc/debian/kvirc-data-trinity.install
index fd6afdc77..fd6afdc77 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.install
+++ b/debian/_base/applications/kvirc/debian/kvirc-data-trinity.install
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.links b/debian/_base/applications/kvirc/debian/kvirc-data-trinity.links
index 831b763bf..831b763bf 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.links
+++ b/debian/_base/applications/kvirc/debian/kvirc-data-trinity.links
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst b/debian/_base/applications/kvirc/debian/kvirc-data-trinity.postinst
index ae66752f1..ae66752f1 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.postinst
+++ b/debian/_base/applications/kvirc/debian/kvirc-data-trinity.postinst
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.prerm b/debian/_base/applications/kvirc/debian/kvirc-data-trinity.prerm
index 4efb6507f..4efb6507f 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-data-trinity.prerm
+++ b/debian/_base/applications/kvirc/debian/kvirc-data-trinity.prerm
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-trinity-dev.install b/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.install
index b786fb7ec..b786fb7ec 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-trinity-dev.install
+++ b/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.install
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-trinity-dev.links b/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.links
index 23a8e59b0..23a8e59b0 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-trinity-dev.links
+++ b/debian/_base/applications/kvirc/debian/kvirc-trinity-dev.links
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install b/debian/_base/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..994dd3e0e 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install
+++ b/debian/_base/applications/kvirc/debian/kvirc-trinity.install
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.menu b/debian/_base/applications/kvirc/debian/kvirc-trinity.menu
index b35945214..b35945214 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.menu
+++ b/debian/_base/applications/kvirc/debian/kvirc-trinity.menu
diff --git a/debian/squeeze/applications/kvirc/debian/overrides/kvirc b/debian/_base/applications/kvirc/debian/overrides/kvirc
index dc125fd2e..dc125fd2e 100644
--- a/debian/squeeze/applications/kvirc/debian/overrides/kvirc
+++ b/debian/_base/applications/kvirc/debian/overrides/kvirc
diff --git a/debian/squeeze/applications/kvirc/debian/patches/series b/debian/_base/applications/kvirc/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kvirc/debian/patches/series
+++ b/debian/_base/applications/kvirc/debian/patches/series
diff --git a/debian/squeeze/applications/kvirc/debian/rules b/debian/_base/applications/kvirc/debian/rules
index 3a8490e65..3a8490e65 100755
--- a/debian/squeeze/applications/kvirc/debian/rules
+++ b/debian/_base/applications/kvirc/debian/rules
diff --git a/debian/squeeze/applications/kvirc/debian/source/format b/debian/_base/applications/kvirc/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kvirc/debian/source/format
+++ b/debian/_base/applications/kvirc/debian/source/format
diff --git a/debian/squeeze/applications/kvirc/debian/source/options b/debian/_base/applications/kvirc/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kvirc/debian/source/options
+++ b/debian/_base/applications/kvirc/debian/source/options
diff --git a/debian/squeeze/applications/kvkbd/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
index 8636ecb37..8636ecb37 100644
--- a/debian/squeeze/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk b/debian/_base/applications/kvkbd/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kvkbd/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kvkbd/debian/cdbs/versions.pl b/debian/_base/applications/kvkbd/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kvkbd/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kvkbd/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kvkbd/debian/changelog b/debian/_base/applications/kvkbd/debian/changelog
index 9d94af90e..9d94af90e 100644
--- a/debian/squeeze/applications/kvkbd/debian/changelog
+++ b/debian/_base/applications/kvkbd/debian/changelog
diff --git a/debian/squeeze/applications/kvkbd/debian/compat b/debian/_base/applications/kvkbd/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kvkbd/debian/compat
+++ b/debian/_base/applications/kvkbd/debian/compat
diff --git a/debian/squeeze/applications/kvkbd/debian/control b/debian/_base/applications/kvkbd/debian/control
index 1b3adaf2b..1b3adaf2b 100644
--- a/debian/squeeze/applications/kvkbd/debian/control
+++ b/debian/_base/applications/kvkbd/debian/control
diff --git a/debian/squeeze/applications/kvkbd/debian/copyright b/debian/_base/applications/kvkbd/debian/copyright
index 6b22ad784..6b22ad784 100644
--- a/debian/squeeze/applications/kvkbd/debian/copyright
+++ b/debian/_base/applications/kvkbd/debian/copyright
diff --git a/debian/squeeze/applications/kvkbd/debian/patches/.gitignore b/debian/_base/applications/kvkbd/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kvkbd/debian/patches/.gitignore
+++ b/debian/_base/applications/kvkbd/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/kvkbd/debian/rules b/debian/_base/applications/kvkbd/debian/rules
index 6abecd47a..6abecd47a 100755
--- a/debian/squeeze/applications/kvkbd/debian/rules
+++ b/debian/_base/applications/kvkbd/debian/rules
diff --git a/debian/squeeze/applications/kvkbd/debian/source/format b/debian/_base/applications/kvkbd/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kvkbd/debian/source/format
+++ b/debian/_base/applications/kvkbd/debian/source/format
diff --git a/debian/squeeze/applications/kvkbd/debian/source/options b/debian/_base/applications/kvkbd/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kvkbd/debian/source/options
+++ b/debian/_base/applications/kvkbd/debian/source/options
diff --git a/debian/squeeze/applications/kvpnc/debian/source/format b/debian/_base/applications/kvpnc/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kvpnc/debian/source/format
+++ b/debian/_base/applications/kvpnc/debian/source/format
diff --git a/debian/squeeze/applications/kvpnc/debian/source/options b/debian/_base/applications/kvpnc/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kvpnc/debian/source/options
+++ b/debian/_base/applications/kvpnc/debian/source/options
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/cdbs/kde.mk b/debian/_base/applications/kwin-style-crystal/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kwin-style-crystal/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/cdbs/versions.pl b/debian/_base/applications/kwin-style-crystal/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/cdbs/versions.pl
+++ b/debian/_base/applications/kwin-style-crystal/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/changelog b/debian/_base/applications/kwin-style-crystal/debian/changelog
index acdd7341d..acdd7341d 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/changelog
+++ b/debian/_base/applications/kwin-style-crystal/debian/changelog
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/compat b/debian/_base/applications/kwin-style-crystal/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/compat
+++ b/debian/_base/applications/kwin-style-crystal/debian/compat
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/control b/debian/_base/applications/kwin-style-crystal/debian/control
index a2725b2ee..a2725b2ee 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/control
+++ b/debian/_base/applications/kwin-style-crystal/debian/control
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/copyright b/debian/_base/applications/kwin-style-crystal/debian/copyright
index dbb28c22d..dbb28c22d 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/copyright
+++ b/debian/_base/applications/kwin-style-crystal/debian/copyright
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/dirs b/debian/_base/applications/kwin-style-crystal/debian/dirs
index cbf4aa905..cbf4aa905 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/dirs
+++ b/debian/_base/applications/kwin-style-crystal/debian/dirs
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/docs b/debian/_base/applications/kwin-style-crystal/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/docs
+++ b/debian/_base/applications/kwin-style-crystal/debian/docs
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/patches/series b/debian/_base/applications/kwin-style-crystal/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/patches/series
+++ b/debian/_base/applications/kwin-style-crystal/debian/patches/series
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/rules b/debian/_base/applications/kwin-style-crystal/debian/rules
index 2546c8657..2546c8657 100755
--- a/debian/squeeze/applications/kwin-style-crystal/debian/rules
+++ b/debian/_base/applications/kwin-style-crystal/debian/rules
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/source/format b/debian/_base/applications/kwin-style-crystal/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/source/format
+++ b/debian/_base/applications/kwin-style-crystal/debian/source/format
diff --git a/debian/squeeze/applications/kwin-style-crystal/debian/source/options b/debian/_base/applications/kwin-style-crystal/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kwin-style-crystal/debian/source/options
+++ b/debian/_base/applications/kwin-style-crystal/debian/source/options
diff --git a/debian/squeeze/applications/piklab/debian/changelog b/debian/_base/applications/piklab/debian/changelog
index b0f58e45c..b0f58e45c 100644
--- a/debian/squeeze/applications/piklab/debian/changelog
+++ b/debian/_base/applications/piklab/debian/changelog
diff --git a/debian/squeeze/applications/piklab/debian/compat b/debian/_base/applications/piklab/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/piklab/debian/compat
+++ b/debian/_base/applications/piklab/debian/compat
diff --git a/debian/squeeze/applications/piklab/debian/control b/debian/_base/applications/piklab/debian/control
index 95848bd18..95848bd18 100644
--- a/debian/squeeze/applications/piklab/debian/control
+++ b/debian/_base/applications/piklab/debian/control
diff --git a/debian/squeeze/applications/piklab/debian/copyright b/debian/_base/applications/piklab/debian/copyright
index 5144c002c..5144c002c 100644
--- a/debian/squeeze/applications/piklab/debian/copyright
+++ b/debian/_base/applications/piklab/debian/copyright
diff --git a/debian/squeeze/applications/piklab/debian/docs b/debian/_base/applications/piklab/debian/docs
index 724e08449..724e08449 100644
--- a/debian/squeeze/applications/piklab/debian/docs
+++ b/debian/_base/applications/piklab/debian/docs
diff --git a/debian/squeeze/applications/piklab/debian/install b/debian/_base/applications/piklab/debian/install
index 4b76727ec..4b76727ec 100644
--- a/debian/squeeze/applications/piklab/debian/install
+++ b/debian/_base/applications/piklab/debian/install
diff --git a/debian/squeeze/applications/piklab/debian/menu b/debian/_base/applications/piklab/debian/menu
index bf328cb78..bf328cb78 100644
--- a/debian/squeeze/applications/piklab/debian/menu
+++ b/debian/_base/applications/piklab/debian/menu
diff --git a/debian/squeeze/applications/piklab/debian/patches/series b/debian/_base/applications/piklab/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/piklab/debian/patches/series
+++ b/debian/_base/applications/piklab/debian/patches/series
diff --git a/debian/squeeze/applications/piklab/debian/piklab.desktop b/debian/_base/applications/piklab/debian/piklab.desktop
index 41e546d50..41e546d50 100644
--- a/debian/squeeze/applications/piklab/debian/piklab.desktop
+++ b/debian/_base/applications/piklab/debian/piklab.desktop
diff --git a/debian/squeeze/applications/piklab/debian/piklab.sng b/debian/_base/applications/piklab/debian/piklab.sng
index 4d2aa5902..4d2aa5902 100644
--- a/debian/squeeze/applications/piklab/debian/piklab.sng
+++ b/debian/_base/applications/piklab/debian/piklab.sng
diff --git a/debian/squeeze/applications/piklab/debian/piklab.xpm b/debian/_base/applications/piklab/debian/piklab.xpm
index 9f7cfe61f..9f7cfe61f 100644
--- a/debian/squeeze/applications/piklab/debian/piklab.xpm
+++ b/debian/_base/applications/piklab/debian/piklab.xpm
diff --git a/debian/squeeze/applications/piklab/debian/piklab48.xpm b/debian/_base/applications/piklab/debian/piklab48.xpm
index c7819f422..c7819f422 100644
--- a/debian/squeeze/applications/piklab/debian/piklab48.xpm
+++ b/debian/_base/applications/piklab/debian/piklab48.xpm
diff --git a/debian/squeeze/applications/piklab/debian/rules b/debian/_base/applications/piklab/debian/rules
index 4fd3da4c2..4fd3da4c2 100755
--- a/debian/squeeze/applications/piklab/debian/rules
+++ b/debian/_base/applications/piklab/debian/rules
diff --git a/debian/squeeze/applications/piklab/debian/source/format b/debian/_base/applications/piklab/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/piklab/debian/source/format
+++ b/debian/_base/applications/piklab/debian/source/format
diff --git a/debian/squeeze/applications/piklab/debian/source/options b/debian/_base/applications/piklab/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/piklab/debian/source/options
+++ b/debian/_base/applications/piklab/debian/source/options
diff --git a/debian/squeeze/applications/potracegui/debian/changelog b/debian/_base/applications/potracegui/debian/changelog
index 87afc2863..87afc2863 100644
--- a/debian/squeeze/applications/potracegui/debian/changelog
+++ b/debian/_base/applications/potracegui/debian/changelog
diff --git a/debian/squeeze/applications/potracegui/debian/compat b/debian/_base/applications/potracegui/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/potracegui/debian/compat
+++ b/debian/_base/applications/potracegui/debian/compat
diff --git a/debian/squeeze/applications/potracegui/debian/control b/debian/_base/applications/potracegui/debian/control
index 946b1132c..946b1132c 100644
--- a/debian/squeeze/applications/potracegui/debian/control
+++ b/debian/_base/applications/potracegui/debian/control
diff --git a/debian/squeeze/applications/potracegui/debian/copyright b/debian/_base/applications/potracegui/debian/copyright
index f3437d1cc..f3437d1cc 100644
--- a/debian/squeeze/applications/potracegui/debian/copyright
+++ b/debian/_base/applications/potracegui/debian/copyright
diff --git a/debian/squeeze/applications/potracegui/debian/dirs b/debian/_base/applications/potracegui/debian/dirs
index 34e17c1b8..34e17c1b8 100644
--- a/debian/squeeze/applications/potracegui/debian/dirs
+++ b/debian/_base/applications/potracegui/debian/dirs
diff --git a/debian/squeeze/applications/potracegui/debian/docs b/debian/_base/applications/potracegui/debian/docs
index ba8894c15..ba8894c15 100644
--- a/debian/squeeze/applications/potracegui/debian/docs
+++ b/debian/_base/applications/potracegui/debian/docs
diff --git a/debian/squeeze/applications/potracegui/debian/potracegui-trinity.1 b/debian/_base/applications/potracegui/debian/potracegui-trinity.1
index ef8dc8b59..ef8dc8b59 100644
--- a/debian/squeeze/applications/potracegui/debian/potracegui-trinity.1
+++ b/debian/_base/applications/potracegui/debian/potracegui-trinity.1
diff --git a/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu b/debian/_base/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..ec42ba351 100644
--- a/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu
+++ b/debian/_base/applications/potracegui/debian/potracegui-trinity.menu
diff --git a/debian/squeeze/applications/potracegui/debian/rules b/debian/_base/applications/potracegui/debian/rules
index fdda3113f..fdda3113f 100755
--- a/debian/squeeze/applications/potracegui/debian/rules
+++ b/debian/_base/applications/potracegui/debian/rules
diff --git a/debian/squeeze/applications/potracegui/debian/source/format b/debian/_base/applications/potracegui/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/potracegui/debian/source/format
+++ b/debian/_base/applications/potracegui/debian/source/format
diff --git a/debian/squeeze/applications/potracegui/debian/source/options b/debian/_base/applications/potracegui/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/potracegui/debian/source/options
+++ b/debian/_base/applications/potracegui/debian/source/options
diff --git a/debian/squeeze/applications/potracegui/debian/watch b/debian/_base/applications/potracegui/debian/watch
index ecb7330aa..ecb7330aa 100644
--- a/debian/squeeze/applications/potracegui/debian/watch
+++ b/debian/_base/applications/potracegui/debian/watch
diff --git a/debian/squeeze/applications/rosegarden/debian/README.Debian b/debian/_base/applications/rosegarden/debian/README.Debian
index 64768c7c2..64768c7c2 100644
--- a/debian/squeeze/applications/rosegarden/debian/README.Debian
+++ b/debian/_base/applications/rosegarden/debian/README.Debian
diff --git a/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index 5510d9d2a..5510d9d2a 100644
--- a/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/rosegarden/debian/cdbs/kde.mk b/debian/_base/applications/rosegarden/debian/cdbs/kde.mk
index b8d83b930..b8d83b930 100644
--- a/debian/squeeze/applications/rosegarden/debian/cdbs/kde.mk
+++ b/debian/_base/applications/rosegarden/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/rosegarden/debian/cdbs/versions.pl b/debian/_base/applications/rosegarden/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/debian/squeeze/applications/rosegarden/debian/cdbs/versions.pl
+++ b/debian/_base/applications/rosegarden/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/rosegarden/debian/changelog b/debian/_base/applications/rosegarden/debian/changelog
index c91341594..c91341594 100644
--- a/debian/squeeze/applications/rosegarden/debian/changelog
+++ b/debian/_base/applications/rosegarden/debian/changelog
diff --git a/debian/squeeze/applications/rosegarden/debian/compat b/debian/_base/applications/rosegarden/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/rosegarden/debian/compat
+++ b/debian/_base/applications/rosegarden/debian/compat
diff --git a/debian/squeeze/applications/rosegarden/debian/control b/debian/_base/applications/rosegarden/debian/control
index 135319eab..135319eab 100644
--- a/debian/squeeze/applications/rosegarden/debian/control
+++ b/debian/_base/applications/rosegarden/debian/control
diff --git a/debian/squeeze/applications/rosegarden/debian/copyright b/debian/_base/applications/rosegarden/debian/copyright
index df2a7e77d..df2a7e77d 100644
--- a/debian/squeeze/applications/rosegarden/debian/copyright
+++ b/debian/_base/applications/rosegarden/debian/copyright
diff --git a/debian/squeeze/applications/rosegarden/debian/lintianoverrides b/debian/_base/applications/rosegarden/debian/lintianoverrides
index 135ea69e9..135ea69e9 100644
--- a/debian/squeeze/applications/rosegarden/debian/lintianoverrides
+++ b/debian/_base/applications/rosegarden/debian/lintianoverrides
diff --git a/debian/squeeze/applications/rosegarden/debian/patches/series b/debian/_base/applications/rosegarden/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/rosegarden/debian/patches/series
+++ b/debian/_base/applications/rosegarden/debian/patches/series
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-audiofile-importer.1 b/debian/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1
index b420ba197..b420ba197 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-audiofile-importer.1
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-audiofile-importer.1
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-data-trinity.install b/debian/_base/applications/rosegarden/debian/rosegarden-data-trinity.install
index 59a4a5943..59a4a5943 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-data-trinity.install
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-data-trinity.install
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-lilypondview.1 b/debian/_base/applications/rosegarden/debian/rosegarden-lilypondview.1
index e2aa9f951..e2aa9f951 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-lilypondview.1
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-lilypondview.1
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-project-package.1 b/debian/_base/applications/rosegarden/debian/rosegarden-project-package.1
index 0da30c2a5..0da30c2a5 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-project-package.1
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-project-package.1
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.dirs b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.dirs
index 1dffbd19c..1dffbd19c 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.dirs
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.dirs
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.docs b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.docs
index 23da6d676..23da6d676 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.docs
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.docs
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.examples b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.examples
index 1e660fdcf..1e660fdcf 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.examples
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.examples
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.install b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.install
index 50a0bcdaa..50a0bcdaa 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.install
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.install
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.links b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.links
index f3d6d1228..f3d6d1228 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.links
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.links
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.menu b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.menu
index ca56a8f26..ca56a8f26 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.menu
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.menu
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
index 3b3894dec..3b3894dec 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
+++ b/debian/_base/applications/rosegarden/debian/rosegarden-trinity.sharedmimeinfo
diff --git a/debian/squeeze/applications/rosegarden/debian/rosegarden.1 b/debian/_base/applications/rosegarden/debian/rosegarden.1
index 91916b271..91916b271 100644
--- a/debian/squeeze/applications/rosegarden/debian/rosegarden.1
+++ b/debian/_base/applications/rosegarden/debian/rosegarden.1
diff --git a/debian/squeeze/applications/rosegarden/debian/rules b/debian/_base/applications/rosegarden/debian/rules
index 03a24f92b..03a24f92b 100755
--- a/debian/squeeze/applications/rosegarden/debian/rules
+++ b/debian/_base/applications/rosegarden/debian/rules
diff --git a/debian/squeeze/applications/rosegarden/debian/semantic.cache b/debian/_base/applications/rosegarden/debian/semantic.cache
index e7b76d07a..e7b76d07a 100644
--- a/debian/squeeze/applications/rosegarden/debian/semantic.cache
+++ b/debian/_base/applications/rosegarden/debian/semantic.cache
diff --git a/debian/squeeze/applications/rosegarden/debian/source/format b/debian/_base/applications/rosegarden/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/rosegarden/debian/source/format
+++ b/debian/_base/applications/rosegarden/debian/source/format
diff --git a/debian/squeeze/applications/rosegarden/debian/source/options b/debian/_base/applications/rosegarden/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/rosegarden/debian/source/options
+++ b/debian/_base/applications/rosegarden/debian/source/options
diff --git a/debian/squeeze/applications/rosegarden/debian/watch b/debian/_base/applications/rosegarden/debian/watch
index f0021dfd7..f0021dfd7 100644
--- a/debian/squeeze/applications/rosegarden/debian/watch
+++ b/debian/_base/applications/rosegarden/debian/watch
diff --git a/debian/squeeze/applications/rosegarden/debian/x-rosegarden.desktop b/debian/_base/applications/rosegarden/debian/x-rosegarden.desktop
index b6b766909..b6b766909 100644
--- a/debian/squeeze/applications/rosegarden/debian/x-rosegarden.desktop
+++ b/debian/_base/applications/rosegarden/debian/x-rosegarden.desktop
diff --git a/debian/squeeze/applications/smartcardauth/debian/changelog b/debian/_base/applications/smartcardauth/debian/changelog
index 4d5f37dad..4d5f37dad 100755
--- a/debian/squeeze/applications/smartcardauth/debian/changelog
+++ b/debian/_base/applications/smartcardauth/debian/changelog
diff --git a/debian/squeeze/applications/smartcardauth/debian/compat b/debian/_base/applications/smartcardauth/debian/compat
index 7f8f011eb..7f8f011eb 100755
--- a/debian/squeeze/applications/smartcardauth/debian/compat
+++ b/debian/_base/applications/smartcardauth/debian/compat
diff --git a/debian/squeeze/applications/smartcardauth/debian/control b/debian/_base/applications/smartcardauth/debian/control
index 938ebada5..938ebada5 100755
--- a/debian/squeeze/applications/smartcardauth/debian/control
+++ b/debian/_base/applications/smartcardauth/debian/control
diff --git a/debian/squeeze/applications/smartcardauth/debian/dirs b/debian/_base/applications/smartcardauth/debian/dirs
index 73752c9ae..73752c9ae 100755
--- a/debian/squeeze/applications/smartcardauth/debian/dirs
+++ b/debian/_base/applications/smartcardauth/debian/dirs
diff --git a/debian/squeeze/applications/smartcardauth/debian/rules b/debian/_base/applications/smartcardauth/debian/rules
index fe74e584a..fe74e584a 100755
--- a/debian/squeeze/applications/smartcardauth/debian/rules
+++ b/debian/_base/applications/smartcardauth/debian/rules
diff --git a/debian/squeeze/applications/smartcardauth/debian/smartcardauth.postinst b/debian/_base/applications/smartcardauth/debian/smartcardauth.postinst
index 842e0017d..842e0017d 100755
--- a/debian/squeeze/applications/smartcardauth/debian/smartcardauth.postinst
+++ b/debian/_base/applications/smartcardauth/debian/smartcardauth.postinst
diff --git a/debian/squeeze/applications/smartcardauth/debian/source/format b/debian/_base/applications/smartcardauth/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/smartcardauth/debian/source/format
+++ b/debian/_base/applications/smartcardauth/debian/source/format
diff --git a/debian/squeeze/applications/smartcardauth/debian/source/options b/debian/_base/applications/smartcardauth/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/smartcardauth/debian/source/options
+++ b/debian/_base/applications/smartcardauth/debian/source/options
diff --git a/debian/squeeze/applications/smb4k/debian/README.Debian b/debian/_base/applications/smb4k/debian/README.Debian
index 995d110e5..995d110e5 100644
--- a/debian/squeeze/applications/smb4k/debian/README.Debian
+++ b/debian/_base/applications/smb4k/debian/README.Debian
diff --git a/debian/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/smb4k/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk b/debian/_base/applications/smb4k/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk
+++ b/debian/_base/applications/smb4k/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/smb4k/debian/cdbs/versions.pl b/debian/_base/applications/smb4k/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/smb4k/debian/cdbs/versions.pl
+++ b/debian/_base/applications/smb4k/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/smb4k/debian/changelog b/debian/_base/applications/smb4k/debian/changelog
index aa842f771..aa842f771 100644
--- a/debian/squeeze/applications/smb4k/debian/changelog
+++ b/debian/_base/applications/smb4k/debian/changelog
diff --git a/debian/squeeze/applications/smb4k/debian/compat b/debian/_base/applications/smb4k/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/smb4k/debian/compat
+++ b/debian/_base/applications/smb4k/debian/compat
diff --git a/debian/squeeze/applications/smb4k/debian/control b/debian/_base/applications/smb4k/debian/control
index 628025dc7..628025dc7 100644
--- a/debian/squeeze/applications/smb4k/debian/control
+++ b/debian/_base/applications/smb4k/debian/control
diff --git a/debian/squeeze/applications/smb4k/debian/copyright b/debian/_base/applications/smb4k/debian/copyright
index d32c049ef..d32c049ef 100644
--- a/debian/squeeze/applications/smb4k/debian/copyright
+++ b/debian/_base/applications/smb4k/debian/copyright
diff --git a/debian/squeeze/applications/smb4k/debian/docs b/debian/_base/applications/smb4k/debian/docs
index e4acf0127..e4acf0127 100644
--- a/debian/squeeze/applications/smb4k/debian/docs
+++ b/debian/_base/applications/smb4k/debian/docs
diff --git a/debian/squeeze/applications/smb4k/debian/menu b/debian/_base/applications/smb4k/debian/menu
index 7f7c9cb2a..7f7c9cb2a 100644
--- a/debian/squeeze/applications/smb4k/debian/menu
+++ b/debian/_base/applications/smb4k/debian/menu
diff --git a/debian/squeeze/applications/smb4k/debian/rules b/debian/_base/applications/smb4k/debian/rules
index c6b04fa37..c6b04fa37 100755
--- a/debian/squeeze/applications/smb4k/debian/rules
+++ b/debian/_base/applications/smb4k/debian/rules
diff --git a/debian/squeeze/applications/smb4k/debian/source/format b/debian/_base/applications/smb4k/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/smb4k/debian/source/format
+++ b/debian/_base/applications/smb4k/debian/source/format
diff --git a/debian/squeeze/applications/smb4k/debian/source/options b/debian/_base/applications/smb4k/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/smb4k/debian/source/options
+++ b/debian/_base/applications/smb4k/debian/source/options
diff --git a/debian/squeeze/applications/smb4k/debian/watch b/debian/_base/applications/smb4k/debian/watch
index 70154d877..70154d877 100644
--- a/debian/squeeze/applications/smb4k/debian/watch
+++ b/debian/_base/applications/smb4k/debian/watch
diff --git a/debian/squeeze/applications/soundkonverter/debian/README.Debian b/debian/_base/applications/soundkonverter/debian/README.Debian
index 079784d5b..079784d5b 100644
--- a/debian/squeeze/applications/soundkonverter/debian/README.Debian
+++ b/debian/_base/applications/soundkonverter/debian/README.Debian
diff --git a/debian/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk b/debian/_base/applications/soundkonverter/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk
+++ b/debian/_base/applications/soundkonverter/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/soundkonverter/debian/cdbs/versions.pl b/debian/_base/applications/soundkonverter/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/soundkonverter/debian/cdbs/versions.pl
+++ b/debian/_base/applications/soundkonverter/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/soundkonverter/debian/changelog b/debian/_base/applications/soundkonverter/debian/changelog
index 585438bcf..585438bcf 100644
--- a/debian/squeeze/applications/soundkonverter/debian/changelog
+++ b/debian/_base/applications/soundkonverter/debian/changelog
diff --git a/debian/squeeze/applications/soundkonverter/debian/compat b/debian/_base/applications/soundkonverter/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/soundkonverter/debian/compat
+++ b/debian/_base/applications/soundkonverter/debian/compat
diff --git a/debian/squeeze/applications/soundkonverter/debian/control b/debian/_base/applications/soundkonverter/debian/control
index 1a2daf802..1a2daf802 100644
--- a/debian/squeeze/applications/soundkonverter/debian/control
+++ b/debian/_base/applications/soundkonverter/debian/control
diff --git a/debian/squeeze/applications/soundkonverter/debian/copyright b/debian/_base/applications/soundkonverter/debian/copyright
index 05bf08795..05bf08795 100644
--- a/debian/squeeze/applications/soundkonverter/debian/copyright
+++ b/debian/_base/applications/soundkonverter/debian/copyright
diff --git a/debian/squeeze/applications/soundkonverter/debian/docs b/debian/_base/applications/soundkonverter/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/applications/soundkonverter/debian/docs
+++ b/debian/_base/applications/soundkonverter/debian/docs
diff --git a/debian/squeeze/applications/soundkonverter/debian/patches/.gitignore b/debian/_base/applications/soundkonverter/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/soundkonverter/debian/patches/.gitignore
+++ b/debian/_base/applications/soundkonverter/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/soundkonverter/debian/rules b/debian/_base/applications/soundkonverter/debian/rules
index ce5932a76..ce5932a76 100755
--- a/debian/squeeze/applications/soundkonverter/debian/rules
+++ b/debian/_base/applications/soundkonverter/debian/rules
diff --git a/debian/squeeze/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install b/debian/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
index 38b81a194..38b81a194 100644
--- a/debian/squeeze/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
+++ b/debian/_base/applications/soundkonverter/debian/soundkonverter-amarok-trinity.install
diff --git a/debian/squeeze/applications/soundkonverter/debian/soundkonverter-trinity.install b/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.install
index 0f6801b72..0f6801b72 100644
--- a/debian/squeeze/applications/soundkonverter/debian/soundkonverter-trinity.install
+++ b/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.install
diff --git a/debian/squeeze/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides b/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
index 6a12cd7d8..6a12cd7d8 100644
--- a/debian/squeeze/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
+++ b/debian/_base/applications/soundkonverter/debian/soundkonverter-trinity.lintian-overrides
diff --git a/debian/squeeze/applications/soundkonverter/debian/source/format b/debian/_base/applications/soundkonverter/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/soundkonverter/debian/source/format
+++ b/debian/_base/applications/soundkonverter/debian/source/format
diff --git a/debian/squeeze/applications/soundkonverter/debian/source/options b/debian/_base/applications/soundkonverter/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/soundkonverter/debian/source/options
+++ b/debian/_base/applications/soundkonverter/debian/source/options
diff --git a/debian/squeeze/applications/tellico/debian/changelog b/debian/_base/applications/tellico/debian/changelog
index e8f8697e8..e8f8697e8 100644
--- a/debian/squeeze/applications/tellico/debian/changelog
+++ b/debian/_base/applications/tellico/debian/changelog
diff --git a/debian/squeeze/applications/tellico/debian/compat b/debian/_base/applications/tellico/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/tellico/debian/compat
+++ b/debian/_base/applications/tellico/debian/compat
diff --git a/debian/squeeze/applications/tellico/debian/control b/debian/_base/applications/tellico/debian/control
index ec254fafe..ec254fafe 100644
--- a/debian/squeeze/applications/tellico/debian/control
+++ b/debian/_base/applications/tellico/debian/control
diff --git a/debian/squeeze/applications/tellico/debian/copyright b/debian/_base/applications/tellico/debian/copyright
index 69496b35c..69496b35c 100644
--- a/debian/squeeze/applications/tellico/debian/copyright
+++ b/debian/_base/applications/tellico/debian/copyright
diff --git a/debian/squeeze/applications/tellico/debian/menu b/debian/_base/applications/tellico/debian/menu
index 430884153..430884153 100644
--- a/debian/squeeze/applications/tellico/debian/menu
+++ b/debian/_base/applications/tellico/debian/menu
diff --git a/debian/squeeze/applications/tellico/debian/rules b/debian/_base/applications/tellico/debian/rules
index 4dfb7936d..4dfb7936d 100755
--- a/debian/squeeze/applications/tellico/debian/rules
+++ b/debian/_base/applications/tellico/debian/rules
diff --git a/debian/squeeze/applications/tellico/debian/source/format b/debian/_base/applications/tellico/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/tellico/debian/source/format
+++ b/debian/_base/applications/tellico/debian/source/format
diff --git a/debian/squeeze/applications/tellico/debian/source/options b/debian/_base/applications/tellico/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/tellico/debian/source/options
+++ b/debian/_base/applications/tellico/debian/source/options
diff --git a/debian/squeeze/applications/tellico/debian/tellico-data-trinity.install b/debian/_base/applications/tellico/debian/tellico-data-trinity.install
index 152ef011b..152ef011b 100644
--- a/debian/squeeze/applications/tellico/debian/tellico-data-trinity.install
+++ b/debian/_base/applications/tellico/debian/tellico-data-trinity.install
diff --git a/debian/squeeze/applications/tellico/debian/tellico-scripts-trinity.install b/debian/_base/applications/tellico/debian/tellico-scripts-trinity.install
index 71c51d5eb..71c51d5eb 100644
--- a/debian/squeeze/applications/tellico/debian/tellico-scripts-trinity.install
+++ b/debian/_base/applications/tellico/debian/tellico-scripts-trinity.install
diff --git a/debian/squeeze/applications/tellico/debian/tellico-trinity.install b/debian/_base/applications/tellico/debian/tellico-trinity.install
index a45d88c99..a45d88c99 100644
--- a/debian/squeeze/applications/tellico/debian/tellico-trinity.install
+++ b/debian/_base/applications/tellico/debian/tellico-trinity.install
diff --git a/debian/squeeze/applications/tellico/debian/tellico.1x b/debian/_base/applications/tellico/debian/tellico.1x
index e102af2c5..e102af2c5 100644
--- a/debian/squeeze/applications/tellico/debian/tellico.1x
+++ b/debian/_base/applications/tellico/debian/tellico.1x
diff --git a/debian/squeeze/applications/tellico/debian/tellico.xpm b/debian/_base/applications/tellico/debian/tellico.xpm
index 589d66eeb..589d66eeb 100644
--- a/debian/squeeze/applications/tellico/debian/tellico.xpm
+++ b/debian/_base/applications/tellico/debian/tellico.xpm
diff --git a/debian/squeeze/applications/tellico/debian/watch b/debian/_base/applications/tellico/debian/watch
index 8e67307f5..8e67307f5 100644
--- a/debian/squeeze/applications/tellico/debian/watch
+++ b/debian/_base/applications/tellico/debian/watch
diff --git a/debian/squeeze/applications/wlassistant/debian/README.Debian b/debian/_base/applications/wlassistant/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/squeeze/applications/wlassistant/debian/README.Debian
+++ b/debian/_base/applications/wlassistant/debian/README.Debian
diff --git a/debian/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/debian/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/wlassistant/debian/cdbs/kde.mk b/debian/_base/applications/wlassistant/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/applications/wlassistant/debian/cdbs/kde.mk
+++ b/debian/_base/applications/wlassistant/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/wlassistant/debian/cdbs/versions.pl b/debian/_base/applications/wlassistant/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/wlassistant/debian/cdbs/versions.pl
+++ b/debian/_base/applications/wlassistant/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/wlassistant/debian/changelog b/debian/_base/applications/wlassistant/debian/changelog
index 69859afc3..69859afc3 100644
--- a/debian/squeeze/applications/wlassistant/debian/changelog
+++ b/debian/_base/applications/wlassistant/debian/changelog
diff --git a/debian/squeeze/applications/wlassistant/debian/compat b/debian/_base/applications/wlassistant/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/wlassistant/debian/compat
+++ b/debian/_base/applications/wlassistant/debian/compat
diff --git a/debian/squeeze/applications/wlassistant/debian/control b/debian/_base/applications/wlassistant/debian/control
index 16e9edfe8..16e9edfe8 100644
--- a/debian/squeeze/applications/wlassistant/debian/control
+++ b/debian/_base/applications/wlassistant/debian/control
diff --git a/debian/squeeze/applications/wlassistant/debian/copyright b/debian/_base/applications/wlassistant/debian/copyright
index 5179772ff..5179772ff 100644
--- a/debian/squeeze/applications/wlassistant/debian/copyright
+++ b/debian/_base/applications/wlassistant/debian/copyright
diff --git a/debian/squeeze/applications/wlassistant/debian/patches/series b/debian/_base/applications/wlassistant/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/wlassistant/debian/patches/series
+++ b/debian/_base/applications/wlassistant/debian/patches/series
diff --git a/debian/squeeze/applications/wlassistant/debian/rules b/debian/_base/applications/wlassistant/debian/rules
index 13db5ab65..13db5ab65 100755
--- a/debian/squeeze/applications/wlassistant/debian/rules
+++ b/debian/_base/applications/wlassistant/debian/rules
diff --git a/debian/squeeze/applications/wlassistant/debian/source/format b/debian/_base/applications/wlassistant/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/wlassistant/debian/source/format
+++ b/debian/_base/applications/wlassistant/debian/source/format
diff --git a/debian/squeeze/applications/wlassistant/debian/source/options b/debian/_base/applications/wlassistant/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/wlassistant/debian/source/options
+++ b/debian/_base/applications/wlassistant/debian/source/options
diff --git a/debian/squeeze/applications/wlassistant/debian/watch b/debian/_base/applications/wlassistant/debian/watch
index 42304de6e..42304de6e 100644
--- a/debian/squeeze/applications/wlassistant/debian/watch
+++ b/debian/_base/applications/wlassistant/debian/watch
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant-16.xpm b/debian/_base/applications/wlassistant/debian/wlassistant-16.xpm
index fcaa89b00..fcaa89b00 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-16.xpm
+++ b/debian/_base/applications/wlassistant/debian/wlassistant-16.xpm
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.dirs b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
index 57855aec4..57855aec4 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.dirs
+++ b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.dirs
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.docs b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.docs
index 8fa4b0c87..8fa4b0c87 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.docs
+++ b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.docs
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.install b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.install
index 7465386d3..7465386d3 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.install
+++ b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.install
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.manpage b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
index fb021a15b..fb021a15b 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.manpage
+++ b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.manpage
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.menu
index dc43a7b0f..dc43a7b0f 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/_base/applications/wlassistant/debian/wlassistant-trinity.menu
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant.xpm b/debian/_base/applications/wlassistant/debian/wlassistant.xpm
index d1f52cbe8..d1f52cbe8 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant.xpm
+++ b/debian/_base/applications/wlassistant/debian/wlassistant.xpm
diff --git a/debian/squeeze/applications/yakuake/debian/README b/debian/_base/applications/yakuake/debian/README
index 85f0e1b9f..85f0e1b9f 100644
--- a/debian/squeeze/applications/yakuake/debian/README
+++ b/debian/_base/applications/yakuake/debian/README
diff --git a/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/yakuake/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk b/debian/_base/applications/yakuake/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk
+++ b/debian/_base/applications/yakuake/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/yakuake/debian/cdbs/versions.pl b/debian/_base/applications/yakuake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/yakuake/debian/cdbs/versions.pl
+++ b/debian/_base/applications/yakuake/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/yakuake/debian/changelog b/debian/_base/applications/yakuake/debian/changelog
index fcb60a3f9..fcb60a3f9 100644
--- a/debian/squeeze/applications/yakuake/debian/changelog
+++ b/debian/_base/applications/yakuake/debian/changelog
diff --git a/debian/squeeze/applications/yakuake/debian/compat b/debian/_base/applications/yakuake/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/yakuake/debian/compat
+++ b/debian/_base/applications/yakuake/debian/compat
diff --git a/debian/squeeze/applications/yakuake/debian/control b/debian/_base/applications/yakuake/debian/control
index ca8c62943..ca8c62943 100644
--- a/debian/squeeze/applications/yakuake/debian/control
+++ b/debian/_base/applications/yakuake/debian/control
diff --git a/debian/squeeze/applications/yakuake/debian/copyright b/debian/_base/applications/yakuake/debian/copyright
index df27b9653..df27b9653 100644
--- a/debian/squeeze/applications/yakuake/debian/copyright
+++ b/debian/_base/applications/yakuake/debian/copyright
diff --git a/debian/squeeze/applications/yakuake/debian/icons/yakuake-16.xpm b/debian/_base/applications/yakuake/debian/icons/yakuake-16.xpm
index a16b98fef..a16b98fef 100644
--- a/debian/squeeze/applications/yakuake/debian/icons/yakuake-16.xpm
+++ b/debian/_base/applications/yakuake/debian/icons/yakuake-16.xpm
diff --git a/debian/squeeze/applications/yakuake/debian/icons/yakuake.xpm b/debian/_base/applications/yakuake/debian/icons/yakuake.xpm
index 6745c7c0e..6745c7c0e 100644
--- a/debian/squeeze/applications/yakuake/debian/icons/yakuake.xpm
+++ b/debian/_base/applications/yakuake/debian/icons/yakuake.xpm
diff --git a/debian/squeeze/applications/yakuake/debian/patches/.gitignore b/debian/_base/applications/yakuake/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/yakuake/debian/patches/.gitignore
+++ b/debian/_base/applications/yakuake/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/yakuake/debian/rules b/debian/_base/applications/yakuake/debian/rules
index f86dc62d5..f86dc62d5 100755
--- a/debian/squeeze/applications/yakuake/debian/rules
+++ b/debian/_base/applications/yakuake/debian/rules
diff --git a/debian/squeeze/applications/yakuake/debian/source/format b/debian/_base/applications/yakuake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/applications/yakuake/debian/source/format
+++ b/debian/_base/applications/yakuake/debian/source/format
diff --git a/debian/squeeze/applications/yakuake/debian/source/options b/debian/_base/applications/yakuake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/yakuake/debian/source/options
+++ b/debian/_base/applications/yakuake/debian/source/options
diff --git a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.1 b/debian/_base/applications/yakuake/debian/yakuake-trinity.1
index 7b404d01e..7b404d01e 100644
--- a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.1
+++ b/debian/_base/applications/yakuake/debian/yakuake-trinity.1
diff --git a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.install b/debian/_base/applications/yakuake/debian/yakuake-trinity.install
index e5e863463..e5e863463 100644
--- a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.install
+++ b/debian/_base/applications/yakuake/debian/yakuake-trinity.install
diff --git a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.manpages b/debian/_base/applications/yakuake/debian/yakuake-trinity.manpages
index f9a1365b5..f9a1365b5 100644
--- a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.manpages
+++ b/debian/_base/applications/yakuake/debian/yakuake-trinity.manpages
diff --git a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu b/debian/_base/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..80d76482b 100644
--- a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu
+++ b/debian/_base/applications/yakuake/debian/yakuake-trinity.menu
diff --git a/debian/squeeze/defaultsettings/desktop-base/Makefile b/debian/_base/defaultsettings/desktop-base/Makefile
index f973f2f06..f973f2f06 100644
--- a/debian/squeeze/defaultsettings/desktop-base/Makefile
+++ b/debian/_base/defaultsettings/desktop-base/Makefile
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png b/debian/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png
index b545a70b5..b545a70b5 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-640x480.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg b/debian/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
index 342510f15..342510f15 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper-widescreen.svg
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg b/debian/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
index 668819dff..668819dff 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/debian-blueish-wallpaper.svg
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png b/debian/_base/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png
index f87aa89e6..f87aa89e6 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz b/debian/_base/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
index ce1826b7f..ce1826b7f 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/gnome-debian-sid-wp.xcf.gz
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png
index f1cc99099..f1cc99099 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2 b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
index 574c298c2..574c298c2 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-grub.svg.tar.bz2
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
index d79d09dba..d79d09dba 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
index 71d1fe759..71d1fe759 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper-widescreen.svg
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
index 8908e000c..8908e000c 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
index 622087d7f..622087d7f 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/moreblue-orbit-wallpaper.svg
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png b/debian/_base/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png
index 9ce61a7e8..9ce61a7e8 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2 b/debian/_base/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
index 2222bac6b..2222bac6b 100644
--- a/debian/squeeze/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
+++ b/debian/_base/defaultsettings/desktop-base/backgrounds/nightly-wallpaper.xcf.tar.bz2
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian-desktop-logo.png b/debian/_base/defaultsettings/desktop-base/debian-desktop-logo.png
index b1e768aef..b1e768aef 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian-desktop-logo.png
+++ b/debian/_base/defaultsettings/desktop-base/debian-desktop-logo.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian-homepage.desktop b/debian/_base/defaultsettings/desktop-base/debian-homepage.desktop
index 384bd14fe..384bd14fe 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian-homepage.desktop
+++ b/debian/_base/defaultsettings/desktop-base/debian-homepage.desktop
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian-reference.desktop b/debian/_base/defaultsettings/desktop-base/debian-reference.desktop
index 36a7992e4..36a7992e4 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian-reference.desktop
+++ b/debian/_base/defaultsettings/desktop-base/debian-reference.desktop
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian-security.desktop b/debian/_base/defaultsettings/desktop-base/debian-security.desktop
index 43d6a1e42..43d6a1e42 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian-security.desktop
+++ b/debian/_base/defaultsettings/desktop-base/debian-security.desktop
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/README.Debian b/debian/_base/defaultsettings/desktop-base/debian/README.Debian
index 260c6fb02..260c6fb02 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/README.Debian
+++ b/debian/_base/defaultsettings/desktop-base/debian/README.Debian
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/changelog b/debian/_base/defaultsettings/desktop-base/debian/changelog
index c09beb592..c09beb592 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/changelog
+++ b/debian/_base/defaultsettings/desktop-base/debian/changelog
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/compat b/debian/_base/defaultsettings/desktop-base/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/compat
+++ b/debian/_base/defaultsettings/desktop-base/debian/compat
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/control b/debian/_base/defaultsettings/desktop-base/debian/control
index 56351a0aa..56351a0aa 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/control
+++ b/debian/_base/defaultsettings/desktop-base/debian/control
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/copyright b/debian/_base/defaultsettings/desktop-base/debian/copyright
index 990146cb7..990146cb7 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/copyright
+++ b/debian/_base/defaultsettings/desktop-base/debian/copyright
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/gconf-defaults b/debian/_base/defaultsettings/desktop-base/debian/gconf-defaults
index 10e4b8297..10e4b8297 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/gconf-defaults
+++ b/debian/_base/defaultsettings/desktop-base/debian/gconf-defaults
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/postinst b/debian/_base/defaultsettings/desktop-base/debian/postinst
index 94a22d5b4..94a22d5b4 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/postinst
+++ b/debian/_base/defaultsettings/desktop-base/debian/postinst
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/postrm b/debian/_base/defaultsettings/desktop-base/debian/postrm
index 864bf9e6a..864bf9e6a 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/postrm
+++ b/debian/_base/defaultsettings/desktop-base/debian/postrm
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/preinst b/debian/_base/defaultsettings/desktop-base/debian/preinst
index d46d14701..d46d14701 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/preinst
+++ b/debian/_base/defaultsettings/desktop-base/debian/preinst
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/prerm b/debian/_base/defaultsettings/desktop-base/debian/prerm
index bf67f87d8..bf67f87d8 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/prerm
+++ b/debian/_base/defaultsettings/desktop-base/debian/prerm
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/rules b/debian/_base/defaultsettings/desktop-base/debian/rules
index 109641b7c..109641b7c 100755
--- a/debian/squeeze/defaultsettings/desktop-base/debian/rules
+++ b/debian/_base/defaultsettings/desktop-base/debian/rules
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/source.lintian-overrides b/debian/_base/defaultsettings/desktop-base/debian/source.lintian-overrides
index cebc8b1f3..cebc8b1f3 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/source.lintian-overrides
+++ b/debian/_base/defaultsettings/desktop-base/debian/source.lintian-overrides
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/source/format b/debian/_base/defaultsettings/desktop-base/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/source/format
+++ b/debian/_base/defaultsettings/desktop-base/debian/source/format
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/source/options b/debian/_base/defaultsettings/desktop-base/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/source/options
+++ b/debian/_base/defaultsettings/desktop-base/debian/source/options
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst b/debian/_base/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst
index 8b26fd83c..8b26fd83c 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst
+++ b/debian/_base/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.postinst
diff --git a/debian/squeeze/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm b/debian/_base/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm
index 079dfdd2b..079dfdd2b 100644
--- a/debian/squeeze/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm
+++ b/debian/_base/defaultsettings/desktop-base/debian/usplash-theme-debian-desktop-trinity.prerm
diff --git a/debian/squeeze/defaultsettings/desktop-base/emblems/emblem-debian.icon b/debian/_base/defaultsettings/desktop-base/emblems/emblem-debian.icon
index 2fbbb0a5b..2fbbb0a5b 100644
--- a/debian/squeeze/defaultsettings/desktop-base/emblems/emblem-debian.icon
+++ b/debian/_base/defaultsettings/desktop-base/emblems/emblem-debian.icon
diff --git a/debian/squeeze/defaultsettings/desktop-base/emblems/emblem-debian.png b/debian/_base/defaultsettings/desktop-base/emblems/emblem-debian.png
index 4927922cc..4927922cc 100644
--- a/debian/squeeze/defaultsettings/desktop-base/emblems/emblem-debian.png
+++ b/debian/_base/defaultsettings/desktop-base/emblems/emblem-debian.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/gnome-backgrounds.xml b/debian/_base/defaultsettings/desktop-base/gnome-backgrounds.xml
index 9391aa82e..9391aa82e 100644
--- a/debian/squeeze/defaultsettings/desktop-base/gnome-backgrounds.xml
+++ b/debian/_base/defaultsettings/desktop-base/gnome-backgrounds.xml
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/GdmGreeterTheme.desktop b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/GdmGreeterTheme.desktop
index b2a3511af..b2a3511af 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/GdmGreeterTheme.desktop
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/GdmGreeterTheme.desktop
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/KdmGreeterTheme.desktop b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/KdmGreeterTheme.desktop
index 336b3d1ab..336b3d1ab 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/KdmGreeterTheme.desktop
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/KdmGreeterTheme.desktop
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/background.svg b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/background.svg
index 4bed799ac..4bed799ac 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/background.svg
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/background.svg
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/boundingbox.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/boundingbox.png
index 3ed8404dc..3ed8404dc 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/boundingbox.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/boundingbox.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/debian-moreblue.xml b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/debian-moreblue.xml
index 703e0d0f2..703e0d0f2 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/debian-moreblue.xml
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/debian-moreblue.xml
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/icon-reboot.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/icon-reboot.png
index 6373e018d..6373e018d 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/icon-reboot.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/icon-reboot.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/icon-session.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/icon-session.png
index ac7843ced..ac7843ced 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/icon-session.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/icon-session.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/screenshot.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/screenshot.png
index fc3e9982c..fc3e9982c 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/screenshot.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/screenshot.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/swirl.svg b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/swirl.svg
index afdf212e3..afdf212e3 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/debian-moreblue/swirl.svg
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/debian-moreblue/swirl.svg
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/kdm.d/10_desktop-base b/debian/_base/defaultsettings/desktop-base/kdm-theme/kdm.d/10_desktop-base
index 3346d91a3..3346d91a3 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/kdm.d/10_desktop-base
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/kdm.d/10_desktop-base
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/GdmGreeterTheme.desktop b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
index b4e9fb6d9..b4e9fb6d9 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/GdmGreeterTheme.desktop
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/KdmGreeterTheme.desktop b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
index 4b90c02ab..4b90c02ab 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/KdmGreeterTheme.desktop
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/background.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/background.png
index 69916901f..69916901f 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/background.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/background.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/background.svg b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/background.svg
index b72c3b2f4..b72c3b2f4 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/background.svg
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/background.svg
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/boundingbox.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/boundingbox.png
index a09afa171..a09afa171 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/boundingbox.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/boundingbox.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/icon-reboot.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/icon-reboot.png
index 6373e018d..6373e018d 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/icon-reboot.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/icon-reboot.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/icon-session.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/icon-session.png
index ac7843ced..ac7843ced 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/icon-session.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/icon-session.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/moreblue-orbit.xml b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/moreblue-orbit.xml
index 2d1234bcd..2d1234bcd 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/moreblue-orbit.xml
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/moreblue-orbit.xml
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/screenshot.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/screenshot.png
index d8a494dbf..d8a494dbf 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/screenshot.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/moreblue-orbit/screenshot.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/GdmGreeterTheme.desktop b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/GdmGreeterTheme.desktop
index 7e64bfcc0..7e64bfcc0 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/GdmGreeterTheme.desktop
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/GdmGreeterTheme.desktop
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/KdmGreeterTheme.desktop b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/KdmGreeterTheme.desktop
index 2eae79097..2eae79097 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/KdmGreeterTheme.desktop
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/KdmGreeterTheme.desktop
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/Sessions.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/Sessions.png
index 41aba5d88..41aba5d88 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/Sessions.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/Sessions.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/Sessions_inactive.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/Sessions_inactive.png
index a1f0345ed..a1f0345ed 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/Sessions_inactive.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/Sessions_inactive.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/System.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/System.png
index 240c2d9b5..240c2d9b5 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/System.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/System.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/System_inactive.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/System_inactive.png
index 4bea4e785..4bea4e785 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/System_inactive.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/System_inactive.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/background.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/background.png
index e7a091ee7..e7a091ee7 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/background.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/background.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/boundingbox.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/boundingbox.png
index 223b74725..223b74725 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/boundingbox.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/boundingbox.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/nightly.xml b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/nightly.xml
index 22c6c1bd8..22c6c1bd8 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/nightly.xml
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/nightly.xml
diff --git a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/screenshot.png b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/screenshot.png
index cf5236829..cf5236829 100644
--- a/debian/squeeze/defaultsettings/desktop-base/kdm-theme/nightly/screenshot.png
+++ b/debian/_base/defaultsettings/desktop-base/kdm-theme/nightly/screenshot.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
index e582ab8c0..e582ab8c0 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Preview.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
index bc20c1153..bc20c1153 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/Theme.rc
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
index 0572ce2eb..0572ce2eb 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_active_bar.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
index 954cbae6f..954cbae6f 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_bottom.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
index fe09df872..fe09df872 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_inactive_bar.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
index cc3e4ae43..cc3e4ae43 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-default/splash_top.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
index d518fd78b..d518fd78b 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Background.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
index 7b3cba641..7b3cba641 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Preview.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
index 9017a337b..9017a337b 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/SourceImages.tar.gz
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
index 86ed5f470..86ed5f470 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/debian-moreblue-moodin/Theme.rc
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
index fadcb633f..fadcb633f 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Preview.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
index bd9d372d2..bd9d372d2 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/Theme.rc
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
index 430cf5263..430cf5263 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_active_bar.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
index c62f5372b..c62f5372b 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_bottom.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
index aef8079f3..aef8079f3 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_inactive_bar.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
index 8680cc018..8680cc018 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-default/splash_top.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
index ac8dd37d3..ac8dd37d3 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Background.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
index 51d1fca48..51d1fca48 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Preview.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
index 90e503689..90e503689 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/moreblue-orbit-moodin/Theme.rc
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png
index 8183df8e3..8183df8e3 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/Preview.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
index 2a947a8f5..2a947a8f5 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/Theme.rc
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2 b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
index 4c842babd..4c842babd 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/nightly-default.xcf.tar.bz2
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
index d12e12ad8..d12e12ad8 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_active_bar.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
index d2fe82b23..d2fe82b23 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_bottom.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
index b4443a4d2..b4443a4d2 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_inactive_bar.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png
index 7fb403585..7fb403585 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-default/splash_top.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png
index a2f883e59..a2f883e59 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/1.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png
index 4ce019d78..4ce019d78 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/2.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png
index 26811fce2..26811fce2 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/3.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png
index ed5b3438c..ed5b3438c 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/4.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png
index dd4220d28..dd4220d28 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/5.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png
index 40f348c81..40f348c81 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/6.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png
index f76c71bc4..f76c71bc4 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/7.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png
index 800e1d284..800e1d284 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/8.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png
index 4b318ce83..4b318ce83 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Preview.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
index 377c9108e..377c9108e 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/Theme.rc
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png
index 9ce61a7e8..9ce61a7e8 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/background.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2 b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
index e633691ca..e633691ca 100644
--- a/debian/squeeze/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
+++ b/debian/_base/defaultsettings/desktop-base/ksplash-theme/nightly-moodin/nightly-moodin.xcf.tar.bz2
diff --git a/debian/squeeze/defaultsettings/desktop-base/pixmaps/debian-security.png b/debian/_base/defaultsettings/desktop-base/pixmaps/debian-security.png
index 672ceca49..672ceca49 100644
--- a/debian/squeeze/defaultsettings/desktop-base/pixmaps/debian-security.png
+++ b/debian/_base/defaultsettings/desktop-base/pixmaps/debian-security.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/pixmaps/debian-security.xcf b/debian/_base/defaultsettings/desktop-base/pixmaps/debian-security.xcf
index e806fcd2c..e806fcd2c 100644
--- a/debian/squeeze/defaultsettings/desktop-base/pixmaps/debian-security.xcf
+++ b/debian/_base/defaultsettings/desktop-base/pixmaps/debian-security.xcf
diff --git a/debian/squeeze/defaultsettings/desktop-base/profiles/kde-profile/kdeglobals b/debian/_base/defaultsettings/desktop-base/profiles/kde-profile/kdeglobals
index aad968653..aad968653 100644
--- a/debian/squeeze/defaultsettings/desktop-base/profiles/kde-profile/kdeglobals
+++ b/debian/_base/defaultsettings/desktop-base/profiles/kde-profile/kdeglobals
diff --git a/debian/squeeze/defaultsettings/desktop-base/profiles/kde-profile/kdm/backgroundrc b/debian/_base/defaultsettings/desktop-base/profiles/kde-profile/kdm/backgroundrc
index 2db7e8c45..2db7e8c45 100644
--- a/debian/squeeze/defaultsettings/desktop-base/profiles/kde-profile/kdm/backgroundrc
+++ b/debian/_base/defaultsettings/desktop-base/profiles/kde-profile/kdm/backgroundrc
diff --git a/debian/squeeze/defaultsettings/desktop-base/profiles/kde-profile/share/config/kdesktoprc b/debian/_base/defaultsettings/desktop-base/profiles/kde-profile/share/config/kdesktoprc
index 9aa289c7e..9aa289c7e 100644
--- a/debian/squeeze/defaultsettings/desktop-base/profiles/kde-profile/share/config/kdesktoprc
+++ b/debian/_base/defaultsettings/desktop-base/profiles/kde-profile/share/config/kdesktoprc
diff --git a/debian/squeeze/defaultsettings/desktop-base/profiles/kde-profile/share/config/ksplashrc b/debian/_base/defaultsettings/desktop-base/profiles/kde-profile/share/config/ksplashrc
index 8bfbc19d1..8bfbc19d1 100644
--- a/debian/squeeze/defaultsettings/desktop-base/profiles/kde-profile/share/config/ksplashrc
+++ b/debian/_base/defaultsettings/desktop-base/profiles/kde-profile/share/config/ksplashrc
diff --git a/debian/squeeze/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc b/debian/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
index 9dcd0663c..9dcd0663c 100644
--- a/debian/squeeze/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
+++ b/debian/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-session.rc
diff --git a/debian/squeeze/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc b/debian/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
index fee4fd455..fee4fd455 100644
--- a/debian/squeeze/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
+++ b/debian/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4-session/xfce4-splash.rc
diff --git a/debian/squeeze/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml b/debian/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
index a1e4ea3ea..a1e4ea3ea 100644
--- a/debian/squeeze/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
+++ b/debian/_base/defaultsettings/desktop-base/profiles/xdg-config/xfce4/mcs_settings/desktop.xml
diff --git a/debian/squeeze/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png b/debian/_base/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png
index 790b7ee75..790b7ee75 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png
+++ b/debian/_base/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz b/debian/_base/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
index e4e3157d4..e4e3157d4 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
+++ b/debian/_base/defaultsettings/desktop-base/splash/gnome-debian-sid-splash.xcf.gz
diff --git a/debian/squeeze/defaultsettings/desktop-base/splash/gnome-splash-curves.png b/debian/_base/defaultsettings/desktop-base/splash/gnome-splash-curves.png
index 98342bd13..98342bd13 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splash/gnome-splash-curves.png
+++ b/debian/_base/defaultsettings/desktop-base/splash/gnome-splash-curves.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png b/debian/_base/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png
index 54302fdb3..54302fdb3 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png
+++ b/debian/_base/defaultsettings/desktop-base/splash/moreblue-orbit-splash.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2 b/debian/_base/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
index 979bd5063..979bd5063 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
+++ b/debian/_base/defaultsettings/desktop-base/splash/moreblue-orbit-splash.svg.tar.bz2
diff --git a/debian/squeeze/defaultsettings/desktop-base/splash/nightly-splash.png b/debian/_base/defaultsettings/desktop-base/splash/nightly-splash.png
index f9dc212b5..f9dc212b5 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splash/nightly-splash.png
+++ b/debian/_base/defaultsettings/desktop-base/splash/nightly-splash.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2 b/debian/_base/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2
index bb8c73087..bb8c73087 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2
+++ b/debian/_base/defaultsettings/desktop-base/splash/nightly-splash.xcf.tar.bz2
diff --git a/debian/squeeze/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf b/debian/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
index 58cd6b5e6..58cd6b5e6 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
+++ b/debian/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/VeraSans.ttf
diff --git a/debian/squeeze/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png b/debian/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png
index 233bcc116..233bcc116 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png
+++ b/debian/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/background-bw.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png b/debian/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png
index e65a562ce..e65a562ce 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png
+++ b/debian/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/background-color.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml b/debian/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
index ece58c6df..ece58c6df 100644
--- a/debian/squeeze/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
+++ b/debian/_base/defaultsettings/desktop-base/splashy/moreblue-orbit/theme.xml
diff --git a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
index 6f677f506..6f677f506 100644
--- a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
+++ b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/Makefile
diff --git a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
index d60e2ed74..d60e2ed74 100644
--- a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
+++ b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/background.svg
diff --git a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif
index ac8c4b80a..ac8c4b80a 100644
--- a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif
+++ b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/cmap.gif
diff --git a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png
index de57c529f..de57c529f 100644
--- a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png
+++ b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/progress.png
diff --git a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
index 59632522e..59632522e 100644
--- a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
+++ b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.c
diff --git a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
index ae8c4dd26..ae8c4dd26 100644
--- a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
+++ b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/theme.in
diff --git a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
index 81f0bd882..81f0bd882 100755
--- a/debian/squeeze/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
+++ b/debian/_base/defaultsettings/desktop-base/usplash/moreblue-orbit/themesetup.sh
diff --git a/debian/squeeze/defaultsettings/redmond-default-settings b/debian/_base/defaultsettings/redmond-default-settings
index 6b32f580f..6b32f580f 120000
--- a/debian/squeeze/defaultsettings/redmond-default-settings
+++ b/debian/_base/defaultsettings/redmond-default-settings
diff --git a/debian/squeeze/defaultsettings/redmond-default-settings-ii b/debian/_base/defaultsettings/redmond-default-settings-ii
index c09669844..c09669844 120000
--- a/debian/squeeze/defaultsettings/redmond-default-settings-ii
+++ b/debian/_base/defaultsettings/redmond-default-settings-ii
diff --git a/debian/squeeze/dependencies/akode/debian/KUBUNTU-DEBIAN-CHANGES b/debian/_base/dependencies/akode/debian/KUBUNTU-DEBIAN-CHANGES
index 481244ae4..481244ae4 100644
--- a/debian/squeeze/dependencies/akode/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/_base/dependencies/akode/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/debian/squeeze/dependencies/akode/debian/cdbs/debian-qt-kde.mk b/debian/_base/dependencies/akode/debian/cdbs/debian-qt-kde.mk
index 106cba47d..106cba47d 100644
--- a/debian/squeeze/dependencies/akode/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/dependencies/akode/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/dependencies/akode/debian/cdbs/kde.mk b/debian/_base/dependencies/akode/debian/cdbs/kde.mk
index 0d878b139..0d878b139 100644
--- a/debian/squeeze/dependencies/akode/debian/cdbs/kde.mk
+++ b/debian/_base/dependencies/akode/debian/cdbs/kde.mk
diff --git a/debian/squeeze/dependencies/akode/debian/cdbs/versions.pl b/debian/_base/dependencies/akode/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/debian/squeeze/dependencies/akode/debian/cdbs/versions.pl
+++ b/debian/_base/dependencies/akode/debian/cdbs/versions.pl
diff --git a/debian/squeeze/dependencies/akode/debian/changelog b/debian/_base/dependencies/akode/debian/changelog
index 9e455da61..9e455da61 100644
--- a/debian/squeeze/dependencies/akode/debian/changelog
+++ b/debian/_base/dependencies/akode/debian/changelog
diff --git a/debian/squeeze/dependencies/akode/debian/compat b/debian/_base/dependencies/akode/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/dependencies/akode/debian/compat
+++ b/debian/_base/dependencies/akode/debian/compat
diff --git a/debian/squeeze/dependencies/akode/debian/control b/debian/_base/dependencies/akode/debian/control
index b411183de..b411183de 100644
--- a/debian/squeeze/dependencies/akode/debian/control
+++ b/debian/_base/dependencies/akode/debian/control
diff --git a/debian/squeeze/dependencies/akode/debian/copyright b/debian/_base/dependencies/akode/debian/copyright
index 34b0f44e6..34b0f44e6 100644
--- a/debian/squeeze/dependencies/akode/debian/copyright
+++ b/debian/_base/dependencies/akode/debian/copyright
diff --git a/debian/squeeze/dependencies/akode/debian/libakode-dev.install b/debian/_base/dependencies/akode/debian/libakode-dev.install
index 573b9c451..573b9c451 100644
--- a/debian/squeeze/dependencies/akode/debian/libakode-dev.install
+++ b/debian/_base/dependencies/akode/debian/libakode-dev.install
diff --git a/debian/squeeze/dependencies/akode/debian/libakode2-mpeg.install b/debian/_base/dependencies/akode/debian/libakode2-mpeg.install
index b854280ea..b854280ea 100644
--- a/debian/squeeze/dependencies/akode/debian/libakode2-mpeg.install
+++ b/debian/_base/dependencies/akode/debian/libakode2-mpeg.install
diff --git a/debian/squeeze/dependencies/akode/debian/libakode2-pulse.install b/debian/_base/dependencies/akode/debian/libakode2-pulse.install
index 5dc1311de..5dc1311de 100644
--- a/debian/squeeze/dependencies/akode/debian/libakode2-pulse.install
+++ b/debian/_base/dependencies/akode/debian/libakode2-pulse.install
diff --git a/debian/squeeze/dependencies/akode/debian/libakode2.install b/debian/_base/dependencies/akode/debian/libakode2.install
index 4e7f7ff74..4e7f7ff74 100644
--- a/debian/squeeze/dependencies/akode/debian/libakode2.install
+++ b/debian/_base/dependencies/akode/debian/libakode2.install
diff --git a/debian/squeeze/dependencies/akode/debian/libakode2.lintian b/debian/_base/dependencies/akode/debian/libakode2.lintian
index 6ce3df3be..6ce3df3be 100644
--- a/debian/squeeze/dependencies/akode/debian/libakode2.lintian
+++ b/debian/_base/dependencies/akode/debian/libakode2.lintian
diff --git a/debian/squeeze/dependencies/akode/debian/patches/series b/debian/_base/dependencies/akode/debian/patches/series
index 8b1378917..8b1378917 100644
--- a/debian/squeeze/dependencies/akode/debian/patches/series
+++ b/debian/_base/dependencies/akode/debian/patches/series
diff --git a/debian/squeeze/dependencies/akode/debian/rules b/debian/_base/dependencies/akode/debian/rules
index 7d457930b..7d457930b 100755
--- a/debian/squeeze/dependencies/akode/debian/rules
+++ b/debian/_base/dependencies/akode/debian/rules
diff --git a/debian/squeeze/dependencies/akode/debian/source/format b/debian/_base/dependencies/akode/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/akode/debian/source/format
+++ b/debian/_base/dependencies/akode/debian/source/format
diff --git a/debian/squeeze/dependencies/akode/debian/source/options b/debian/_base/dependencies/akode/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/akode/debian/source/options
+++ b/debian/_base/dependencies/akode/debian/source/options
diff --git a/debian/squeeze/dependencies/arts/debian/README.Debian b/debian/_base/dependencies/arts/debian/README.Debian
index ca22be3b5..ca22be3b5 100644
--- a/debian/squeeze/dependencies/arts/debian/README.Debian
+++ b/debian/_base/dependencies/arts/debian/README.Debian
diff --git a/debian/squeeze/dependencies/arts/debian/arts-trinity.docs b/debian/_base/dependencies/arts/debian/arts-trinity.docs
index e174728f5..e174728f5 100644
--- a/debian/squeeze/dependencies/arts/debian/arts-trinity.docs
+++ b/debian/_base/dependencies/arts/debian/arts-trinity.docs
diff --git a/debian/squeeze/dependencies/arts/debian/cdbs/debian-qt-kde.mk b/debian/_base/dependencies/arts/debian/cdbs/debian-qt-kde.mk
index 65f5f6f95..65f5f6f95 100644
--- a/debian/squeeze/dependencies/arts/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/dependencies/arts/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/dependencies/arts/debian/cdbs/versions.pl b/debian/_base/dependencies/arts/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/dependencies/arts/debian/cdbs/versions.pl
+++ b/debian/_base/dependencies/arts/debian/cdbs/versions.pl
diff --git a/debian/squeeze/dependencies/arts/debian/changelog b/debian/_base/dependencies/arts/debian/changelog
index acfad87ba..acfad87ba 100644
--- a/debian/squeeze/dependencies/arts/debian/changelog
+++ b/debian/_base/dependencies/arts/debian/changelog
diff --git a/debian/squeeze/dependencies/arts/debian/compat b/debian/_base/dependencies/arts/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/dependencies/arts/debian/compat
+++ b/debian/_base/dependencies/arts/debian/compat
diff --git a/debian/squeeze/dependencies/arts/debian/control b/debian/_base/dependencies/arts/debian/control
index 842e6ba67..842e6ba67 100644
--- a/debian/squeeze/dependencies/arts/debian/control
+++ b/debian/_base/dependencies/arts/debian/control
diff --git a/debian/squeeze/dependencies/arts/debian/copyright b/debian/_base/dependencies/arts/debian/copyright
index 41e40af0a..41e40af0a 100644
--- a/debian/squeeze/dependencies/arts/debian/copyright
+++ b/debian/_base/dependencies/arts/debian/copyright
diff --git a/debian/squeeze/dependencies/arts/debian/libarts1-trinity-dev.docs b/debian/_base/dependencies/arts/debian/libarts1-trinity-dev.docs
index e174728f5..e174728f5 100644
--- a/debian/squeeze/dependencies/arts/debian/libarts1-trinity-dev.docs
+++ b/debian/_base/dependencies/arts/debian/libarts1-trinity-dev.docs
diff --git a/debian/squeeze/dependencies/arts/debian/libarts1-trinity-dev.install b/debian/_base/dependencies/arts/debian/libarts1-trinity-dev.install
index 4e4e83f62..4e4e83f62 100644
--- a/debian/squeeze/dependencies/arts/debian/libarts1-trinity-dev.install
+++ b/debian/_base/dependencies/arts/debian/libarts1-trinity-dev.install
diff --git a/debian/squeeze/dependencies/arts/debian/libarts1c2a-trinity.docs b/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.docs
index e174728f5..e174728f5 100644
--- a/debian/squeeze/dependencies/arts/debian/libarts1c2a-trinity.docs
+++ b/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.docs
diff --git a/debian/squeeze/dependencies/arts/debian/libarts1c2a-trinity.install b/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.install
index 856cad6c5..856cad6c5 100644
--- a/debian/squeeze/dependencies/arts/debian/libarts1c2a-trinity.install
+++ b/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.install
diff --git a/debian/squeeze/dependencies/arts/debian/libarts1c2a-trinity.manpages b/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
index 8d7f5c573..8d7f5c573 100644
--- a/debian/squeeze/dependencies/arts/debian/libarts1c2a-trinity.manpages
+++ b/debian/_base/dependencies/arts/debian/libarts1c2a-trinity.manpages
diff --git a/debian/squeeze/dependencies/arts/debian/libartsc0-dev-trinity.manpages b/debian/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
index cef6ee689..cef6ee689 100644
--- a/debian/squeeze/dependencies/arts/debian/libartsc0-dev-trinity.manpages
+++ b/debian/_base/dependencies/arts/debian/libartsc0-dev-trinity.manpages
diff --git a/debian/squeeze/dependencies/arts/debian/libartsc0-trinity-dev.install b/debian/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
index 125ebc39e..125ebc39e 100644
--- a/debian/squeeze/dependencies/arts/debian/libartsc0-trinity-dev.install
+++ b/debian/_base/dependencies/arts/debian/libartsc0-trinity-dev.install
diff --git a/debian/squeeze/dependencies/arts/debian/libartsc0-trinity.install b/debian/_base/dependencies/arts/debian/libartsc0-trinity.install
index 5295e3952..5295e3952 100644
--- a/debian/squeeze/dependencies/arts/debian/libartsc0-trinity.install
+++ b/debian/_base/dependencies/arts/debian/libartsc0-trinity.install
diff --git a/debian/squeeze/dependencies/arts/debian/man/artsc-config-trinity.sgml b/debian/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
index 8072e337d..8072e337d 100644
--- a/debian/squeeze/dependencies/arts/debian/man/artsc-config-trinity.sgml
+++ b/debian/_base/dependencies/arts/debian/man/artsc-config-trinity.sgml
diff --git a/debian/squeeze/dependencies/arts/debian/man/artscat-trinity.sgml b/debian/_base/dependencies/arts/debian/man/artscat-trinity.sgml
index 7dff34d95..7dff34d95 100644
--- a/debian/squeeze/dependencies/arts/debian/man/artscat-trinity.sgml
+++ b/debian/_base/dependencies/arts/debian/man/artscat-trinity.sgml
diff --git a/debian/squeeze/dependencies/arts/debian/man/artsdsp-trinity.1 b/debian/_base/dependencies/arts/debian/man/artsdsp-trinity.1
index 2615f47c2..2615f47c2 100644
--- a/debian/squeeze/dependencies/arts/debian/man/artsdsp-trinity.1
+++ b/debian/_base/dependencies/arts/debian/man/artsdsp-trinity.1
diff --git a/debian/squeeze/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff b/debian/_base/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
index cae8f366d..cae8f366d 100644
--- a/debian/squeeze/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
+++ b/debian/_base/dependencies/arts/debian/patches/12_cleanup_artsc-config.diff
diff --git a/debian/squeeze/dependencies/arts/debian/patches/series b/debian/_base/dependencies/arts/debian/patches/series
index 59e055db8..59e055db8 100644
--- a/debian/squeeze/dependencies/arts/debian/patches/series
+++ b/debian/_base/dependencies/arts/debian/patches/series
diff --git a/debian/squeeze/dependencies/arts/debian/rules b/debian/_base/dependencies/arts/debian/rules
index 2e7e5c14f..2e7e5c14f 100755
--- a/debian/squeeze/dependencies/arts/debian/rules
+++ b/debian/_base/dependencies/arts/debian/rules
diff --git a/debian/squeeze/dependencies/arts/debian/source/format b/debian/_base/dependencies/arts/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/arts/debian/source/format
+++ b/debian/_base/dependencies/arts/debian/source/format
diff --git a/debian/squeeze/dependencies/arts/debian/source/options b/debian/_base/dependencies/arts/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/arts/debian/source/options
+++ b/debian/_base/dependencies/arts/debian/source/options
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/changelog b/debian/_base/dependencies/avahi-tqt/debian/changelog
index 2401c4285..2401c4285 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/changelog
+++ b/debian/_base/dependencies/avahi-tqt/debian/changelog
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/compat b/debian/_base/dependencies/avahi-tqt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/compat
+++ b/debian/_base/dependencies/avahi-tqt/debian/compat
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/control b/debian/_base/dependencies/avahi-tqt/debian/control
index 178ad58a4..178ad58a4 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/control
+++ b/debian/_base/dependencies/avahi-tqt/debian/control
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/copyright b/debian/_base/dependencies/avahi-tqt/debian/copyright
index 6771a11ab..6771a11ab 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/copyright
+++ b/debian/_base/dependencies/avahi-tqt/debian/copyright
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.install b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
index 50e360b80..50e360b80 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
+++ b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.install
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
index 967448229..967448229 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
+++ b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.shlibs
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
index e530241ba..e530241ba 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
+++ b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-1.symbols
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
index 7f65054bd..7f65054bd 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
+++ b/debian/_base/dependencies/avahi-tqt/debian/libavahi-tqt-dev.install
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/patches/.gitignore b/debian/_base/dependencies/avahi-tqt/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/patches/.gitignore
+++ b/debian/_base/dependencies/avahi-tqt/debian/patches/.gitignore
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/rules b/debian/_base/dependencies/avahi-tqt/debian/rules
index 4929325df..4929325df 100755
--- a/debian/squeeze/dependencies/avahi-tqt/debian/rules
+++ b/debian/_base/dependencies/avahi-tqt/debian/rules
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/source/.gitignore b/debian/_base/dependencies/avahi-tqt/debian/source/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/source/.gitignore
+++ b/debian/_base/dependencies/avahi-tqt/debian/source/.gitignore
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/source/format b/debian/_base/dependencies/avahi-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/source/format
+++ b/debian/_base/dependencies/avahi-tqt/debian/source/format
diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/source/options b/debian/_base/dependencies/avahi-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/avahi-tqt/debian/source/options
+++ b/debian/_base/dependencies/avahi-tqt/debian/source/options
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/changelog b/debian/_base/dependencies/dbus-1-tqt/debian/changelog
index 6ade667cf..6ade667cf 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/changelog
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/changelog
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/compat b/debian/_base/dependencies/dbus-1-tqt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/compat
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/compat
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/control b/debian/_base/dependencies/dbus-1-tqt/debian/control
index fdc5f9fcb..fdc5f9fcb 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/control
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/control
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/copyright b/debian/_base/dependencies/dbus-1-tqt/debian/copyright
index 2369bdcef..2369bdcef 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/copyright
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/copyright
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install b/debian/_base/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install
index 5464fd411..5464fd411 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/libdbus-1-tqt-dev.install
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install b/debian/_base/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install
index 383103395..383103395 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/libdbus-1-tqt.install
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/patches/series b/debian/_base/dependencies/dbus-1-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/patches/series
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/patches/series
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/rules b/debian/_base/dependencies/dbus-1-tqt/debian/rules
index eedd1bf26..eedd1bf26 100755
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/rules
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/rules
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/source/format b/debian/_base/dependencies/dbus-1-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/source/format
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/source/format
diff --git a/debian/squeeze/dependencies/dbus-1-tqt/debian/source/options b/debian/_base/dependencies/dbus-1-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/dbus-1-tqt/debian/source/options
+++ b/debian/_base/dependencies/dbus-1-tqt/debian/source/options
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/changelog b/debian/_base/dependencies/dbus-tqt/debian/changelog
index 91871211a..91871211a 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/changelog
+++ b/debian/_base/dependencies/dbus-tqt/debian/changelog
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/compat b/debian/_base/dependencies/dbus-tqt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/compat
+++ b/debian/_base/dependencies/dbus-tqt/debian/compat
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/control b/debian/_base/dependencies/dbus-tqt/debian/control
index 6c939ba09..6c939ba09 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/control
+++ b/debian/_base/dependencies/dbus-tqt/debian/control
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/copyright b/debian/_base/dependencies/dbus-tqt/debian/copyright
index 9541c0a8f..9541c0a8f 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/copyright
+++ b/debian/_base/dependencies/dbus-tqt/debian/copyright
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install
index bf44f3563..bf44f3563 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install
+++ b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-1c2.install
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install
index 6ee3e25c3..6ee3e25c3 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install
+++ b/debian/_base/dependencies/dbus-tqt/debian/libdbus-tqt-1-dev.install
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/patches/series b/debian/_base/dependencies/dbus-tqt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/patches/series
+++ b/debian/_base/dependencies/dbus-tqt/debian/patches/series
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/rules b/debian/_base/dependencies/dbus-tqt/debian/rules
index 71f625c30..71f625c30 100755
--- a/debian/squeeze/dependencies/dbus-tqt/debian/rules
+++ b/debian/_base/dependencies/dbus-tqt/debian/rules
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/source/format b/debian/_base/dependencies/dbus-tqt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/source/format
+++ b/debian/_base/dependencies/dbus-tqt/debian/source/format
diff --git a/debian/squeeze/dependencies/dbus-tqt/debian/source/options b/debian/_base/dependencies/dbus-tqt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/dbus-tqt/debian/source/options
+++ b/debian/_base/dependencies/dbus-tqt/debian/source/options
diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/source/format b/debian/_base/dependencies/libart-lgpl/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/libart-lgpl/debian/source/format
+++ b/debian/_base/dependencies/libart-lgpl/debian/source/format
diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/source/options b/debian/_base/dependencies/libart-lgpl/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/libart-lgpl/debian/source/options
+++ b/debian/_base/dependencies/libart-lgpl/debian/source/options
diff --git a/debian/squeeze/dependencies/qt3/debian/README.Debian b/debian/_base/dependencies/qt3/debian/README.Debian
index 7cc02d1ec..7cc02d1ec 100644
--- a/debian/squeeze/dependencies/qt3/debian/README.Debian
+++ b/debian/_base/dependencies/qt3/debian/README.Debian
diff --git a/debian/squeeze/dependencies/qt3/debian/changelog b/debian/_base/dependencies/qt3/debian/changelog
index 8d00b1ad6..8d00b1ad6 100644
--- a/debian/squeeze/dependencies/qt3/debian/changelog
+++ b/debian/_base/dependencies/qt3/debian/changelog
diff --git a/debian/squeeze/dependencies/qt3/debian/compat b/debian/_base/dependencies/qt3/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/dependencies/qt3/debian/compat
+++ b/debian/_base/dependencies/qt3/debian/compat
diff --git a/debian/squeeze/dependencies/qt3/debian/control b/debian/_base/dependencies/qt3/debian/control
index 4c0c195bf..4c0c195bf 100644
--- a/debian/squeeze/dependencies/qt3/debian/control
+++ b/debian/_base/dependencies/qt3/debian/control
diff --git a/debian/squeeze/dependencies/qt3/debian/copyright b/debian/_base/dependencies/qt3/debian/copyright
index 78872c85b..78872c85b 100644
--- a/debian/squeeze/dependencies/qt3/debian/copyright
+++ b/debian/_base/dependencies/qt3/debian/copyright
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-compat-headers.install b/debian/_base/dependencies/qt3/debian/libqt3-compat-headers.install
index d760342dd..d760342dd 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-compat-headers.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-compat-headers.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-headers.install b/debian/_base/dependencies/qt3/debian/libqt3-headers.install
index 2c789fcee..2c789fcee 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-headers.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-headers.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-i18n.install b/debian/_base/dependencies/qt3/debian/libqt3-i18n.install
index ac62f216d..ac62f216d 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-i18n.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-i18n.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-dev.docs b/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.docs
index dbd9a5d19..dbd9a5d19 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-dev.docs
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.docs
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-dev.install b/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.install
index 09432e016..09432e016 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-dev.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-dev.links b/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.links
index 506e3e49b..506e3e49b 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-dev.links
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.links
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-ibase.install b/debian/_base/dependencies/qt3/debian/libqt3-mt-ibase.install
index e7d5a549a..e7d5a549a 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-ibase.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt-ibase.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-mysql.install b/debian/_base/dependencies/qt3/debian/libqt3-mt-mysql.install
index 8fba7992f..8fba7992f 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-mysql.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt-mysql.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-odbc.install b/debian/_base/dependencies/qt3/debian/libqt3-mt-odbc.install
index f06ddf32c..f06ddf32c 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-odbc.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt-odbc.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-psql.install b/debian/_base/dependencies/qt3/debian/libqt3-mt-psql.install
index f9914863f..f9914863f 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-psql.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt-psql.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-sqlite.install b/debian/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install
index 1bdd0e354..1bdd0e354 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt-sqlite.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt.docs b/debian/_base/dependencies/qt3/debian/libqt3-mt.docs
index dbd9a5d19..dbd9a5d19 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt.docs
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt.docs
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt.install b/debian/_base/dependencies/qt3/debian/libqt3-mt.install
index 325e87900..325e87900 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt.install
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt.links b/debian/_base/dependencies/qt3/debian/libqt3-mt.links
index d8375caef..d8375caef 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt.links
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt.links
diff --git a/debian/squeeze/dependencies/qt3/debian/libqt3-mt.postrm b/debian/_base/dependencies/qt3/debian/libqt3-mt.postrm
index 5f09e318d..5f09e318d 100644
--- a/debian/squeeze/dependencies/qt3/debian/libqt3-mt.postrm
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt.postrm
diff --git a/debian/squeeze/dependencies/qt3/debian/maintain/assistant-qt3.desktop b/debian/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop
index 42a16e80e..42a16e80e 100644
--- a/debian/squeeze/dependencies/qt3/debian/maintain/assistant-qt3.desktop
+++ b/debian/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop
diff --git a/debian/squeeze/dependencies/qt3/debian/maintain/build-examples.sh b/debian/_base/dependencies/qt3/debian/maintain/build-examples.sh
index b56d51e42..b56d51e42 100644
--- a/debian/squeeze/dependencies/qt3/debian/maintain/build-examples.sh
+++ b/debian/_base/dependencies/qt3/debian/maintain/build-examples.sh
diff --git a/debian/squeeze/dependencies/qt3/debian/maintain/designer-qt3.desktop b/debian/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop
index fc9f4394c..fc9f4394c 100644
--- a/debian/squeeze/dependencies/qt3/debian/maintain/designer-qt3.desktop
+++ b/debian/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop
diff --git a/debian/squeeze/dependencies/qt3/debian/maintain/linguist-qt3.desktop b/debian/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop
index e0094dbd4..e0094dbd4 100644
--- a/debian/squeeze/dependencies/qt3/debian/maintain/linguist-qt3.desktop
+++ b/debian/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop
diff --git a/debian/squeeze/dependencies/qt3/debian/maintain/mkpatch.sh b/debian/_base/dependencies/qt3/debian/maintain/mkpatch.sh
index 609a44bc1..609a44bc1 100644
--- a/debian/squeeze/dependencies/qt3/debian/maintain/mkpatch.sh
+++ b/debian/_base/dependencies/qt3/debian/maintain/mkpatch.sh
diff --git a/debian/squeeze/dependencies/qt3/debian/maintain/qt3config.desktop b/debian/_base/dependencies/qt3/debian/maintain/qt3config.desktop
index 22d0ca6a5..22d0ca6a5 100644
--- a/debian/squeeze/dependencies/qt3/debian/maintain/qt3config.desktop
+++ b/debian/_base/dependencies/qt3/debian/maintain/qt3config.desktop
diff --git a/debian/squeeze/dependencies/qt3/debian/patches/06_disable_rpath.diff b/debian/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff
index 27fc1426c..27fc1426c 100644
--- a/debian/squeeze/dependencies/qt3/debian/patches/06_disable_rpath.diff
+++ b/debian/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff
diff --git a/debian/squeeze/dependencies/qt3/debian/patches/09_amd64_lib64.diff b/debian/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff
index 1708af1a2..1708af1a2 100644
--- a/debian/squeeze/dependencies/qt3/debian/patches/09_amd64_lib64.diff
+++ b/debian/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff
diff --git a/debian/squeeze/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/debian/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
index b4e71d35b..b4e71d35b 100644
--- a/debian/squeeze/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+++ b/debian/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
diff --git a/debian/squeeze/dependencies/qt3/debian/patches/series b/debian/_base/dependencies/qt3/debian/patches/series
index e6bdb92af..e6bdb92af 100644
--- a/debian/squeeze/dependencies/qt3/debian/patches/series
+++ b/debian/_base/dependencies/qt3/debian/patches/series
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install b/debian/_base/dependencies/qt3/debian/qt3-apps-dev.install
index ad98c3165..ad98c3165 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install
+++ b/debian/_base/dependencies/qt3/debian/qt3-apps-dev.install
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.links b/debian/_base/dependencies/qt3/debian/qt3-apps-dev.links
index 6c031422f..6c031422f 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.links
+++ b/debian/_base/dependencies/qt3/debian/qt3-apps-dev.links
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.install b/debian/_base/dependencies/qt3/debian/qt3-assistant.install
index 4ca90e4b7..4ca90e4b7 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.install
+++ b/debian/_base/dependencies/qt3/debian/qt3-assistant.install
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.links b/debian/_base/dependencies/qt3/debian/qt3-assistant.links
index 6d9889d21..6d9889d21 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.links
+++ b/debian/_base/dependencies/qt3/debian/qt3-assistant.links
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.menu b/debian/_base/dependencies/qt3/debian/qt3-assistant.menu
index 997a47b23..997a47b23 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.menu
+++ b/debian/_base/dependencies/qt3/debian/qt3-assistant.menu
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.postinst b/debian/_base/dependencies/qt3/debian/qt3-assistant.postinst
index 137ecd777..137ecd777 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.postinst
+++ b/debian/_base/dependencies/qt3/debian/qt3-assistant.postinst
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.prerm b/debian/_base/dependencies/qt3/debian/qt3-assistant.prerm
index 9bcf8c713..9bcf8c713 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-assistant.prerm
+++ b/debian/_base/dependencies/qt3/debian/qt3-assistant.prerm
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-designer.install b/debian/_base/dependencies/qt3/debian/qt3-designer.install
index ac0c0902b..ac0c0902b 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-designer.install
+++ b/debian/_base/dependencies/qt3/debian/qt3-designer.install
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-designer.links b/debian/_base/dependencies/qt3/debian/qt3-designer.links
index d25356b76..d25356b76 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-designer.links
+++ b/debian/_base/dependencies/qt3/debian/qt3-designer.links
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-designer.menu b/debian/_base/dependencies/qt3/debian/qt3-designer.menu
index 065115120..065115120 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-designer.menu
+++ b/debian/_base/dependencies/qt3/debian/qt3-designer.menu
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-designer.postinst b/debian/_base/dependencies/qt3/debian/qt3-designer.postinst
index 147bf1bf8..147bf1bf8 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-designer.postinst
+++ b/debian/_base/dependencies/qt3/debian/qt3-designer.postinst
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-designer.prerm b/debian/_base/dependencies/qt3/debian/qt3-designer.prerm
index c66496fd1..c66496fd1 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-designer.prerm
+++ b/debian/_base/dependencies/qt3/debian/qt3-designer.prerm
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools-compat.install b/debian/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install
index 838f6b827..838f6b827 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools-compat.install
+++ b/debian/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools-embedded.install b/debian/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install
index 2954f7a4c..2954f7a4c 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools-embedded.install
+++ b/debian/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools-embedded.links b/debian/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links
index feacdd2c4..feacdd2c4 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools-embedded.links
+++ b/debian/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools.install b/debian/_base/dependencies/qt3/debian/qt3-dev-tools.install
index 57f9636e5..57f9636e5 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools.install
+++ b/debian/_base/dependencies/qt3/debian/qt3-dev-tools.install
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools.links b/debian/_base/dependencies/qt3/debian/qt3-dev-tools.links
index 3a9ee784c..3a9ee784c 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools.links
+++ b/debian/_base/dependencies/qt3/debian/qt3-dev-tools.links
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools.postinst b/debian/_base/dependencies/qt3/debian/qt3-dev-tools.postinst
index 70ca043fe..70ca043fe 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools.postinst
+++ b/debian/_base/dependencies/qt3/debian/qt3-dev-tools.postinst
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools.prerm b/debian/_base/dependencies/qt3/debian/qt3-dev-tools.prerm
index 3db3df44b..3db3df44b 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-dev-tools.prerm
+++ b/debian/_base/dependencies/qt3/debian/qt3-dev-tools.prerm
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-doc.doc-base b/debian/_base/dependencies/qt3/debian/qt3-doc.doc-base
index 86f7e5798..86f7e5798 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-doc.doc-base
+++ b/debian/_base/dependencies/qt3/debian/qt3-doc.doc-base
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-doc.docs b/debian/_base/dependencies/qt3/debian/qt3-doc.docs
index f08fd0f02..f08fd0f02 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-doc.docs
+++ b/debian/_base/dependencies/qt3/debian/qt3-doc.docs
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-doc.links b/debian/_base/dependencies/qt3/debian/qt3-doc.links
index e8b1a344c..e8b1a344c 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-doc.links
+++ b/debian/_base/dependencies/qt3/debian/qt3-doc.links
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.install b/debian/_base/dependencies/qt3/debian/qt3-linguist.install
index ff9ac89a1..ff9ac89a1 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.install
+++ b/debian/_base/dependencies/qt3/debian/qt3-linguist.install
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.links b/debian/_base/dependencies/qt3/debian/qt3-linguist.links
index be3092258..be3092258 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.links
+++ b/debian/_base/dependencies/qt3/debian/qt3-linguist.links
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.menu b/debian/_base/dependencies/qt3/debian/qt3-linguist.menu
index d0b39269e..d0b39269e 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.menu
+++ b/debian/_base/dependencies/qt3/debian/qt3-linguist.menu
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.postinst b/debian/_base/dependencies/qt3/debian/qt3-linguist.postinst
index ed27c328b..ed27c328b 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.postinst
+++ b/debian/_base/dependencies/qt3/debian/qt3-linguist.postinst
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.prerm b/debian/_base/dependencies/qt3/debian/qt3-linguist.prerm
index 74b010627..74b010627 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-linguist.prerm
+++ b/debian/_base/dependencies/qt3/debian/qt3-linguist.prerm
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.install b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.install
index 8fcee756b..8fcee756b 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.install
+++ b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.install
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.links b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.links
index 9a168aec4..9a168aec4 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.links
+++ b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.links
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.menu b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.menu
index c8b243496..c8b243496 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.menu
+++ b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.menu
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.postinst b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.postinst
index be89a0151..be89a0151 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.postinst
+++ b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.postinst
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.prerm b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.prerm
index 3985383b4..3985383b4 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-qtconfig.prerm
+++ b/debian/_base/dependencies/qt3/debian/qt3-qtconfig.prerm
diff --git a/debian/squeeze/dependencies/qt3/debian/qt_plugins_3.3rc b/debian/_base/dependencies/qt3/debian/qt_plugins_3.3rc
index 9fb7f9711..9fb7f9711 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt_plugins_3.3rc
+++ b/debian/_base/dependencies/qt3/debian/qt_plugins_3.3rc
diff --git a/debian/squeeze/dependencies/qt3/debian/qtrc b/debian/_base/dependencies/qt3/debian/qtrc
index 3c977f4d1..3c977f4d1 100644
--- a/debian/squeeze/dependencies/qt3/debian/qtrc
+++ b/debian/_base/dependencies/qt3/debian/qtrc
diff --git a/debian/squeeze/dependencies/qt3/debian/rules b/debian/_base/dependencies/qt3/debian/rules
index cf3ea25fb..cf3ea25fb 100755
--- a/debian/squeeze/dependencies/qt3/debian/rules
+++ b/debian/_base/dependencies/qt3/debian/rules
diff --git a/debian/squeeze/dependencies/qt3/debian/source/format b/debian/_base/dependencies/qt3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/qt3/debian/source/format
+++ b/debian/_base/dependencies/qt3/debian/source/format
diff --git a/debian/squeeze/dependencies/qt3/debian/source/options b/debian/_base/dependencies/qt3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/qt3/debian/source/options
+++ b/debian/_base/dependencies/qt3/debian/source/options
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/source/format b/debian/_base/dependencies/tqca-tls/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/tqca-tls/debian/source/format
+++ b/debian/_base/dependencies/tqca-tls/debian/source/format
diff --git a/debian/squeeze/dependencies/tqca-tls/debian/source/options b/debian/_base/dependencies/tqca-tls/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/tqca-tls/debian/source/options
+++ b/debian/_base/dependencies/tqca-tls/debian/source/options
diff --git a/debian/squeeze/dependencies/tqscintilla/debian/source/format b/debian/_base/dependencies/tqscintilla/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/tqscintilla/debian/source/format
+++ b/debian/_base/dependencies/tqscintilla/debian/source/format
diff --git a/debian/squeeze/dependencies/tqscintilla/debian/source/options b/debian/_base/dependencies/tqscintilla/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/tqscintilla/debian/source/options
+++ b/debian/_base/dependencies/tqscintilla/debian/source/options
diff --git a/debian/squeeze/dependencies/tqt3/debian/source/format b/debian/_base/dependencies/tqt3/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/tqt3/debian/source/format
+++ b/debian/_base/dependencies/tqt3/debian/source/format
diff --git a/debian/squeeze/dependencies/tqt3/debian/source/options b/debian/_base/dependencies/tqt3/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/tqt3/debian/source/options
+++ b/debian/_base/dependencies/tqt3/debian/source/options
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/changelog b/debian/_base/dependencies/tqtinterface/debian/changelog
index 460ca1061..460ca1061 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/changelog
+++ b/debian/_base/dependencies/tqtinterface/debian/changelog
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/compat b/debian/_base/dependencies/tqtinterface/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/compat
+++ b/debian/_base/dependencies/tqtinterface/debian/compat
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/control b/debian/_base/dependencies/tqtinterface/debian/control
index 017aabe0e..017aabe0e 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/control
+++ b/debian/_base/dependencies/tqtinterface/debian/control
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/copyright b/debian/_base/dependencies/tqtinterface/debian/copyright
index 978e1bb3e..978e1bb3e 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/copyright
+++ b/debian/_base/dependencies/tqtinterface/debian/copyright
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/doc-base b/debian/_base/dependencies/tqtinterface/debian/doc-base
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/doc-base
+++ b/debian/_base/dependencies/tqtinterface/debian/doc-base
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/docs b/debian/_base/dependencies/tqtinterface/debian/docs
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/docs
+++ b/debian/_base/dependencies/tqtinterface/debian/docs
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface-dev.install b/debian/_base/dependencies/tqtinterface/debian/libtqtinterface-dev.install
index fc1624cb1..fc1624cb1 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface-dev.install
+++ b/debian/_base/dependencies/tqtinterface/debian/libtqtinterface-dev.install
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface.install b/debian/_base/dependencies/tqtinterface/debian/libtqtinterface.install
index cd06159b1..cd06159b1 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface.install
+++ b/debian/_base/dependencies/tqtinterface/debian/libtqtinterface.install
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/links b/debian/_base/dependencies/tqtinterface/debian/links
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/links
+++ b/debian/_base/dependencies/tqtinterface/debian/links
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/patches/series b/debian/_base/dependencies/tqtinterface/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/patches/series
+++ b/debian/_base/dependencies/tqtinterface/debian/patches/series
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules
index 7f0eea47b..7f0eea47b 100755
--- a/debian/squeeze/dependencies/tqtinterface/debian/rules
+++ b/debian/_base/dependencies/tqtinterface/debian/rules
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/source/format b/debian/_base/dependencies/tqtinterface/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/source/format
+++ b/debian/_base/dependencies/tqtinterface/debian/source/format
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/source/options b/debian/_base/dependencies/tqtinterface/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/source/options
+++ b/debian/_base/dependencies/tqtinterface/debian/source/options
diff --git a/debian/squeeze/kde-i18n/debian/changelog b/debian/_base/kde-i18n/debian/changelog
index 290010b6e..290010b6e 100644
--- a/debian/squeeze/kde-i18n/debian/changelog
+++ b/debian/_base/kde-i18n/debian/changelog
diff --git a/debian/squeeze/kde-i18n/debian/compat b/debian/_base/kde-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kde-i18n/debian/compat
+++ b/debian/_base/kde-i18n/debian/compat
diff --git a/debian/squeeze/kde-i18n/debian/control b/debian/_base/kde-i18n/debian/control
index 0d6f3ffc2..0d6f3ffc2 100644
--- a/debian/squeeze/kde-i18n/debian/control
+++ b/debian/_base/kde-i18n/debian/control
diff --git a/debian/squeeze/kde-i18n/debian/copyright b/debian/_base/kde-i18n/debian/copyright
index aac858d55..aac858d55 100644
--- a/debian/squeeze/kde-i18n/debian/copyright
+++ b/debian/_base/kde-i18n/debian/copyright
diff --git a/debian/squeeze/kde-i18n/debian/debiandirs b/debian/_base/kde-i18n/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/debian/squeeze/kde-i18n/debian/debiandirs
+++ b/debian/_base/kde-i18n/debian/debiandirs
diff --git a/debian/squeeze/kde-i18n/debian/rules b/debian/_base/kde-i18n/debian/rules
index f821e5339..f821e5339 100755
--- a/debian/squeeze/kde-i18n/debian/rules
+++ b/debian/_base/kde-i18n/debian/rules
diff --git a/debian/squeeze/kde-i18n/debian/source/format b/debian/_base/kde-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kde-i18n/debian/source/format
+++ b/debian/_base/kde-i18n/debian/source/format
diff --git a/debian/squeeze/kde-i18n/debian/source/options b/debian/_base/kde-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kde-i18n/debian/source/options
+++ b/debian/_base/kde-i18n/debian/source/options
diff --git a/debian/squeeze/kdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES
index fe338c20b..fe338c20b 100644
--- a/debian/squeeze/kdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdeaccessibility/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/debian/squeeze/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdeaccessibility/debian/cdbs/kde.mk b/debian/_base/kdeaccessibility/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdeaccessibility/debian/cdbs/kde.mk
+++ b/debian/_base/kdeaccessibility/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdeaccessibility/debian/cdbs/versions.pl b/debian/_base/kdeaccessibility/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdeaccessibility/debian/cdbs/versions.pl
+++ b/debian/_base/kdeaccessibility/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdeaccessibility/debian/changelog b/debian/_base/kdeaccessibility/debian/changelog
index a41ed7638..a41ed7638 100644
--- a/debian/squeeze/kdeaccessibility/debian/changelog
+++ b/debian/_base/kdeaccessibility/debian/changelog
diff --git a/debian/squeeze/kdeaccessibility/debian/compat b/debian/_base/kdeaccessibility/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdeaccessibility/debian/compat
+++ b/debian/_base/kdeaccessibility/debian/compat
diff --git a/debian/squeeze/kdeaccessibility/debian/control b/debian/_base/kdeaccessibility/debian/control
index c5e386175..c5e386175 100644
--- a/debian/squeeze/kdeaccessibility/debian/control
+++ b/debian/_base/kdeaccessibility/debian/control
diff --git a/debian/squeeze/kdeaccessibility/debian/copyright b/debian/_base/kdeaccessibility/debian/copyright
index a5ae39688..a5ae39688 100644
--- a/debian/squeeze/kdeaccessibility/debian/copyright
+++ b/debian/_base/kdeaccessibility/debian/copyright
diff --git a/debian/squeeze/kdeaccessibility/debian/icons/kmag-16.xpm b/debian/_base/kdeaccessibility/debian/icons/kmag-16.xpm
index 4fd4e826a..4fd4e826a 100644
--- a/debian/squeeze/kdeaccessibility/debian/icons/kmag-16.xpm
+++ b/debian/_base/kdeaccessibility/debian/icons/kmag-16.xpm
diff --git a/debian/squeeze/kdeaccessibility/debian/icons/kmag.xpm b/debian/_base/kdeaccessibility/debian/icons/kmag.xpm
index 5f7bcea45..5f7bcea45 100644
--- a/debian/squeeze/kdeaccessibility/debian/icons/kmag.xpm
+++ b/debian/_base/kdeaccessibility/debian/icons/kmag.xpm
diff --git a/debian/squeeze/kdeaccessibility/debian/icons/kmousetool-16.xpm b/debian/_base/kdeaccessibility/debian/icons/kmousetool-16.xpm
index 74a11e135..74a11e135 100644
--- a/debian/squeeze/kdeaccessibility/debian/icons/kmousetool-16.xpm
+++ b/debian/_base/kdeaccessibility/debian/icons/kmousetool-16.xpm
diff --git a/debian/squeeze/kdeaccessibility/debian/icons/kmousetool.xpm b/debian/_base/kdeaccessibility/debian/icons/kmousetool.xpm
index 0a25d71f1..0a25d71f1 100644
--- a/debian/squeeze/kdeaccessibility/debian/icons/kmousetool.xpm
+++ b/debian/_base/kdeaccessibility/debian/icons/kmousetool.xpm
diff --git a/debian/squeeze/kdeaccessibility/debian/icons/kmouth-16.xpm b/debian/_base/kdeaccessibility/debian/icons/kmouth-16.xpm
index dc538ae44..dc538ae44 100644
--- a/debian/squeeze/kdeaccessibility/debian/icons/kmouth-16.xpm
+++ b/debian/_base/kdeaccessibility/debian/icons/kmouth-16.xpm
diff --git a/debian/squeeze/kdeaccessibility/debian/icons/kmouth.xpm b/debian/_base/kdeaccessibility/debian/icons/kmouth.xpm
index b0b027449..b0b027449 100644
--- a/debian/squeeze/kdeaccessibility/debian/icons/kmouth.xpm
+++ b/debian/_base/kdeaccessibility/debian/icons/kmouth.xpm
diff --git a/debian/squeeze/kdeaccessibility/debian/icons/ksayit-16.xpm b/debian/_base/kdeaccessibility/debian/icons/ksayit-16.xpm
index 3f4ed6de3..3f4ed6de3 100644
--- a/debian/squeeze/kdeaccessibility/debian/icons/ksayit-16.xpm
+++ b/debian/_base/kdeaccessibility/debian/icons/ksayit-16.xpm
diff --git a/debian/squeeze/kdeaccessibility/debian/icons/ksayit.xpm b/debian/_base/kdeaccessibility/debian/icons/ksayit.xpm
index a89efc70f..a89efc70f 100644
--- a/debian/squeeze/kdeaccessibility/debian/icons/ksayit.xpm
+++ b/debian/_base/kdeaccessibility/debian/icons/ksayit.xpm
diff --git a/debian/squeeze/kdeaccessibility/debian/kbstate-trinity.install b/debian/_base/kdeaccessibility/debian/kbstate-trinity.install
index a5c05d80c..a5c05d80c 100644
--- a/debian/squeeze/kdeaccessibility/debian/kbstate-trinity.install
+++ b/debian/_base/kdeaccessibility/debian/kbstate-trinity.install
diff --git a/debian/squeeze/kdeaccessibility/debian/kde-icons-mono-trinity.install b/debian/_base/kdeaccessibility/debian/kde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/debian/squeeze/kdeaccessibility/debian/kde-icons-mono-trinity.install
+++ b/debian/_base/kdeaccessibility/debian/kde-icons-mono-trinity.install
diff --git a/debian/squeeze/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag b/debian/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag
index 73ad856ab..73ad856ab 100644
--- a/debian/squeeze/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag
+++ b/debian/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag
diff --git a/debian/squeeze/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool b/debian/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool
index 50912a620..50912a620 100644
--- a/debian/squeeze/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool
+++ b/debian/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool
diff --git a/debian/squeeze/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth b/debian/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth
index c51acf449..c51acf449 100644
--- a/debian/squeeze/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth
+++ b/debian/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth
diff --git a/debian/squeeze/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd b/debian/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd
index e296ff7b8..e296ff7b8 100644
--- a/debian/squeeze/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd
+++ b/debian/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd
diff --git a/debian/squeeze/kdeaccessibility/debian/kmag-trinity.install b/debian/_base/kdeaccessibility/debian/kmag-trinity.install
index 246740b9c..246740b9c 100644
--- a/debian/squeeze/kdeaccessibility/debian/kmag-trinity.install
+++ b/debian/_base/kdeaccessibility/debian/kmag-trinity.install
diff --git a/debian/squeeze/kdeaccessibility/debian/kmag-trinity.manpages b/debian/_base/kdeaccessibility/debian/kmag-trinity.manpages
index 6579ddb0f..6579ddb0f 100644
--- a/debian/squeeze/kdeaccessibility/debian/kmag-trinity.manpages
+++ b/debian/_base/kdeaccessibility/debian/kmag-trinity.manpages
diff --git a/debian/squeeze/kdeaccessibility/debian/kmag-trinity.menu b/debian/_base/kdeaccessibility/debian/kmag-trinity.menu
index e65ffb1d6..e65ffb1d6 100644
--- a/debian/squeeze/kdeaccessibility/debian/kmag-trinity.menu
+++ b/debian/_base/kdeaccessibility/debian/kmag-trinity.menu
diff --git a/debian/squeeze/kdeaccessibility/debian/kmousetool-trinity.install b/debian/_base/kdeaccessibility/debian/kmousetool-trinity.install
index 51eb07e7e..51eb07e7e 100644
--- a/debian/squeeze/kdeaccessibility/debian/kmousetool-trinity.install
+++ b/debian/_base/kdeaccessibility/debian/kmousetool-trinity.install
diff --git a/debian/squeeze/kdeaccessibility/debian/kmousetool-trinity.manpages b/debian/_base/kdeaccessibility/debian/kmousetool-trinity.manpages
index 4ebe07483..4ebe07483 100644
--- a/debian/squeeze/kdeaccessibility/debian/kmousetool-trinity.manpages
+++ b/debian/_base/kdeaccessibility/debian/kmousetool-trinity.manpages
diff --git a/debian/squeeze/kdeaccessibility/debian/kmousetool-trinity.menu b/debian/_base/kdeaccessibility/debian/kmousetool-trinity.menu
index 1925a2979..1925a2979 100644
--- a/debian/squeeze/kdeaccessibility/debian/kmousetool-trinity.menu
+++ b/debian/_base/kdeaccessibility/debian/kmousetool-trinity.menu
diff --git a/debian/squeeze/kdeaccessibility/debian/kmouth-trinity.install b/debian/_base/kdeaccessibility/debian/kmouth-trinity.install
index b9eed5500..b9eed5500 100644
--- a/debian/squeeze/kdeaccessibility/debian/kmouth-trinity.install
+++ b/debian/_base/kdeaccessibility/debian/kmouth-trinity.install
diff --git a/debian/squeeze/kdeaccessibility/debian/kmouth-trinity.manpages b/debian/_base/kdeaccessibility/debian/kmouth-trinity.manpages
index b459b0888..b459b0888 100644
--- a/debian/squeeze/kdeaccessibility/debian/kmouth-trinity.manpages
+++ b/debian/_base/kdeaccessibility/debian/kmouth-trinity.manpages
diff --git a/debian/squeeze/kdeaccessibility/debian/kmouth-trinity.menu b/debian/_base/kdeaccessibility/debian/kmouth-trinity.menu
index 249e7792e..249e7792e 100644
--- a/debian/squeeze/kdeaccessibility/debian/kmouth-trinity.menu
+++ b/debian/_base/kdeaccessibility/debian/kmouth-trinity.menu
diff --git a/debian/squeeze/kdeaccessibility/debian/ksayit-trinity.install b/debian/_base/kdeaccessibility/debian/ksayit-trinity.install
index 2f5be2460..2f5be2460 100644
--- a/debian/squeeze/kdeaccessibility/debian/ksayit-trinity.install
+++ b/debian/_base/kdeaccessibility/debian/ksayit-trinity.install
diff --git a/debian/squeeze/kdeaccessibility/debian/ksayit-trinity.menu b/debian/_base/kdeaccessibility/debian/ksayit-trinity.menu
index a88a21ebc..a88a21ebc 100644
--- a/debian/squeeze/kdeaccessibility/debian/ksayit-trinity.menu
+++ b/debian/_base/kdeaccessibility/debian/ksayit-trinity.menu
diff --git a/debian/squeeze/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install b/debian/_base/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
index 698f85fe2..698f85fe2 100644
--- a/debian/squeeze/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
+++ b/debian/_base/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
diff --git a/debian/squeeze/kdeaccessibility/debian/kttsd-trinity.install b/debian/_base/kdeaccessibility/debian/kttsd-trinity.install
index 550a4fa02..550a4fa02 100644
--- a/debian/squeeze/kdeaccessibility/debian/kttsd-trinity.install
+++ b/debian/_base/kdeaccessibility/debian/kttsd-trinity.install
diff --git a/debian/squeeze/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/debian/_base/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
index ad08c3f72..ad08c3f72 100644
--- a/debian/squeeze/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
+++ b/debian/_base/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
diff --git a/debian/squeeze/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/debian/_base/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
index ad08c3f72..ad08c3f72 100644
--- a/debian/squeeze/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
+++ b/debian/_base/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
diff --git a/debian/squeeze/kdeaccessibility/debian/kttsd.README.Debian b/debian/_base/kdeaccessibility/debian/kttsd.README.Debian
index e2c0cf91f..e2c0cf91f 100644
--- a/debian/squeeze/kdeaccessibility/debian/kttsd.README.Debian
+++ b/debian/_base/kdeaccessibility/debian/kttsd.README.Debian
diff --git a/debian/squeeze/kdeaccessibility/debian/man/kdeopt-trinity.part b/debian/_base/kdeaccessibility/debian/man/kdeopt-trinity.part
index 9ab90ed9c..9ab90ed9c 100644
--- a/debian/squeeze/kdeaccessibility/debian/man/kdeopt-trinity.part
+++ b/debian/_base/kdeaccessibility/debian/man/kdeopt-trinity.part
diff --git a/debian/squeeze/kdeaccessibility/debian/man/kmag-trinity.man b/debian/_base/kdeaccessibility/debian/man/kmag-trinity.man
index c05ffb6ce..c05ffb6ce 100644
--- a/debian/squeeze/kdeaccessibility/debian/man/kmag-trinity.man
+++ b/debian/_base/kdeaccessibility/debian/man/kmag-trinity.man
diff --git a/debian/squeeze/kdeaccessibility/debian/man/kmousetool-trinity.man b/debian/_base/kdeaccessibility/debian/man/kmousetool-trinity.man
index 1b077f746..1b077f746 100644
--- a/debian/squeeze/kdeaccessibility/debian/man/kmousetool-trinity.man
+++ b/debian/_base/kdeaccessibility/debian/man/kmousetool-trinity.man
diff --git a/debian/squeeze/kdeaccessibility/debian/man/kmouth-trinity.man b/debian/_base/kdeaccessibility/debian/man/kmouth-trinity.man
index e0f9ee485..e0f9ee485 100644
--- a/debian/squeeze/kdeaccessibility/debian/man/kmouth-trinity.man
+++ b/debian/_base/kdeaccessibility/debian/man/kmouth-trinity.man
diff --git a/debian/squeeze/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdeaccessibility/debian/patches/series b/debian/_base/kdeaccessibility/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdeaccessibility/debian/patches/series
+++ b/debian/_base/kdeaccessibility/debian/patches/series
diff --git a/debian/squeeze/kdeaccessibility/debian/rules b/debian/_base/kdeaccessibility/debian/rules
index 40438cdd6..40438cdd6 100755
--- a/debian/squeeze/kdeaccessibility/debian/rules
+++ b/debian/_base/kdeaccessibility/debian/rules
diff --git a/debian/squeeze/kdeaccessibility/debian/source/format b/debian/_base/kdeaccessibility/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdeaccessibility/debian/source/format
+++ b/debian/_base/kdeaccessibility/debian/source/format
diff --git a/debian/squeeze/kdeaccessibility/debian/source/options b/debian/_base/kdeaccessibility/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdeaccessibility/debian/source/options
+++ b/debian/_base/kdeaccessibility/debian/source/options
diff --git a/debian/squeeze/kdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
index da64a9233..da64a9233 100644
--- a/debian/squeeze/kdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdeaddons/debian/atlantikdesigner-trinity.docs b/debian/_base/kdeaddons/debian/atlantikdesigner-trinity.docs
index c83224ab3..c83224ab3 100644
--- a/debian/squeeze/kdeaddons/debian/atlantikdesigner-trinity.docs
+++ b/debian/_base/kdeaddons/debian/atlantikdesigner-trinity.docs
diff --git a/debian/squeeze/kdeaddons/debian/atlantikdesigner-trinity.install b/debian/_base/kdeaddons/debian/atlantikdesigner-trinity.install
index 825b20fde..825b20fde 100644
--- a/debian/squeeze/kdeaddons/debian/atlantikdesigner-trinity.install
+++ b/debian/_base/kdeaddons/debian/atlantikdesigner-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/atlantikdesigner-trinity.manpages b/debian/_base/kdeaddons/debian/atlantikdesigner-trinity.manpages
index f0b5385f4..f0b5385f4 100644
--- a/debian/squeeze/kdeaddons/debian/atlantikdesigner-trinity.manpages
+++ b/debian/_base/kdeaddons/debian/atlantikdesigner-trinity.manpages
diff --git a/debian/squeeze/kdeaddons/debian/atlantikdesigner-trinity.menu b/debian/_base/kdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..3f5845f50 100644
--- a/debian/squeeze/kdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/debian/_base/kdeaddons/debian/atlantikdesigner-trinity.menu
diff --git a/debian/squeeze/kdeaddons/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdeaddons/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/debian/squeeze/kdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdeaddons/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdeaddons/debian/cdbs/kde.mk b/debian/_base/kdeaddons/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdeaddons/debian/cdbs/kde.mk
+++ b/debian/_base/kdeaddons/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdeaddons/debian/cdbs/versions.pl b/debian/_base/kdeaddons/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdeaddons/debian/cdbs/versions.pl
+++ b/debian/_base/kdeaddons/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdeaddons/debian/changelog b/debian/_base/kdeaddons/debian/changelog
index 73bd4d9e5..73bd4d9e5 100644
--- a/debian/squeeze/kdeaddons/debian/changelog
+++ b/debian/_base/kdeaddons/debian/changelog
diff --git a/debian/squeeze/kdeaddons/debian/compat b/debian/_base/kdeaddons/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdeaddons/debian/compat
+++ b/debian/_base/kdeaddons/debian/compat
diff --git a/debian/squeeze/kdeaddons/debian/control b/debian/_base/kdeaddons/debian/control
index 1bc2c6913..1bc2c6913 100644
--- a/debian/squeeze/kdeaddons/debian/control
+++ b/debian/_base/kdeaddons/debian/control
diff --git a/debian/squeeze/kdeaddons/debian/copyright b/debian/_base/kdeaddons/debian/copyright
index f954fd3dc..f954fd3dc 100644
--- a/debian/squeeze/kdeaddons/debian/copyright
+++ b/debian/_base/kdeaddons/debian/copyright
diff --git a/debian/squeeze/kdeaddons/debian/icons/atlantikdesigner.xpm b/debian/_base/kdeaddons/debian/icons/atlantikdesigner.xpm
index 6375271fe..6375271fe 100644
--- a/debian/squeeze/kdeaddons/debian/icons/atlantikdesigner.xpm
+++ b/debian/_base/kdeaddons/debian/icons/atlantikdesigner.xpm
diff --git a/debian/squeeze/kdeaddons/debian/icons/fsview.xpm b/debian/_base/kdeaddons/debian/icons/fsview.xpm
index b50ac952c..b50ac952c 100644
--- a/debian/squeeze/kdeaddons/debian/icons/fsview.xpm
+++ b/debian/_base/kdeaddons/debian/icons/fsview.xpm
diff --git a/debian/squeeze/kdeaddons/debian/icons/ksig.xpm b/debian/_base/kdeaddons/debian/icons/ksig.xpm
index 805e027d1..805e027d1 100644
--- a/debian/squeeze/kdeaddons/debian/icons/ksig.xpm
+++ b/debian/_base/kdeaddons/debian/icons/ksig.xpm
diff --git a/debian/squeeze/kdeaddons/debian/kaddressbook-plugins-trinity.install b/debian/_base/kdeaddons/debian/kaddressbook-plugins-trinity.install
index a2102d3a8..a2102d3a8 100644
--- a/debian/squeeze/kdeaddons/debian/kaddressbook-plugins-trinity.install
+++ b/debian/_base/kdeaddons/debian/kaddressbook-plugins-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.README.Debian b/debian/_base/kdeaddons/debian/kate-plugins-trinity.README.Debian
index 933d86cd0..933d86cd0 100644
--- a/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.README.Debian
+++ b/debian/_base/kdeaddons/debian/kate-plugins-trinity.README.Debian
diff --git a/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.docs b/debian/_base/kdeaddons/debian/kate-plugins-trinity.docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.docs
+++ b/debian/_base/kdeaddons/debian/kate-plugins-trinity.docs
diff --git a/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.install b/debian/_base/kdeaddons/debian/kate-plugins-trinity.install
index 06e96f20f..06e96f20f 100644
--- a/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.install
+++ b/debian/_base/kdeaddons/debian/kate-plugins-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.lintian b/debian/_base/kdeaddons/debian/kate-plugins-trinity.lintian
index 27eca0292..27eca0292 100644
--- a/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.lintian
+++ b/debian/_base/kdeaddons/debian/kate-plugins-trinity.lintian
diff --git a/debian/squeeze/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins b/debian/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
index 7eaee07d9..7eaee07d9 100644
--- a/debian/squeeze/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
+++ b/debian/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
diff --git a/debian/squeeze/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets b/debian/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
index 863894246..863894246 100644
--- a/debian/squeeze/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
+++ b/debian/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
diff --git a/debian/squeeze/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins b/debian/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
index 4e89e7f68..4e89e7f68 100644
--- a/debian/squeeze/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
+++ b/debian/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
diff --git a/debian/squeeze/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install b/debian/_base/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
index a85a16b55..a85a16b55 100644
--- a/debian/squeeze/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
+++ b/debian/_base/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages b/debian/_base/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages
index eda9949fb..eda9949fb 100644
--- a/debian/squeeze/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages
+++ b/debian/_base/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages
diff --git a/debian/squeeze/kdeaddons/debian/kdeaddons-trinity.README.Debian b/debian/_base/kdeaddons/debian/kdeaddons-trinity.README.Debian
index 0daab22b0..0daab22b0 100644
--- a/debian/squeeze/kdeaddons/debian/kdeaddons-trinity.README.Debian
+++ b/debian/_base/kdeaddons/debian/kdeaddons-trinity.README.Debian
diff --git a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.README.Debian b/debian/_base/kdeaddons/debian/kicker-applets-trinity.README.Debian
index 881d7b395..881d7b395 100644
--- a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.README.Debian
+++ b/debian/_base/kdeaddons/debian/kicker-applets-trinity.README.Debian
diff --git a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.docs b/debian/_base/kdeaddons/debian/kicker-applets-trinity.docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.docs
+++ b/debian/_base/kdeaddons/debian/kicker-applets-trinity.docs
diff --git a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.install b/debian/_base/kdeaddons/debian/kicker-applets-trinity.install
index 3ffd7717e..3ffd7717e 100644
--- a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.install
+++ b/debian/_base/kdeaddons/debian/kicker-applets-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.lintian b/debian/_base/kdeaddons/debian/kicker-applets-trinity.lintian
index 705d74139..705d74139 100644
--- a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.lintian
+++ b/debian/_base/kdeaddons/debian/kicker-applets-trinity.lintian
diff --git a/debian/squeeze/kdeaddons/debian/knewsticker-scripts-trinity.README.Debian b/debian/_base/kdeaddons/debian/knewsticker-scripts-trinity.README.Debian
index c6986aa86..c6986aa86 100644
--- a/debian/squeeze/kdeaddons/debian/knewsticker-scripts-trinity.README.Debian
+++ b/debian/_base/kdeaddons/debian/knewsticker-scripts-trinity.README.Debian
diff --git a/debian/squeeze/kdeaddons/debian/knewsticker-scripts-trinity.docs b/debian/_base/kdeaddons/debian/knewsticker-scripts-trinity.docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/kdeaddons/debian/knewsticker-scripts-trinity.docs
+++ b/debian/_base/kdeaddons/debian/knewsticker-scripts-trinity.docs
diff --git a/debian/squeeze/kdeaddons/debian/knewsticker-scripts-trinity.install b/debian/_base/kdeaddons/debian/knewsticker-scripts-trinity.install
index ce04dabc0..ce04dabc0 100644
--- a/debian/squeeze/kdeaddons/debian/knewsticker-scripts-trinity.install
+++ b/debian/_base/kdeaddons/debian/knewsticker-scripts-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/knewsticker-scripts-trinity.links b/debian/_base/kdeaddons/debian/knewsticker-scripts-trinity.links
index d7b05a420..d7b05a420 100644
--- a/debian/squeeze/kdeaddons/debian/knewsticker-scripts-trinity.links
+++ b/debian/_base/kdeaddons/debian/knewsticker-scripts-trinity.links
diff --git a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.README.Debian b/debian/_base/kdeaddons/debian/konq-plugins-trinity.README.Debian
index 75c1d8461..75c1d8461 100644
--- a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.README.Debian
+++ b/debian/_base/kdeaddons/debian/konq-plugins-trinity.README.Debian
diff --git a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.docs b/debian/_base/kdeaddons/debian/konq-plugins-trinity.docs
index 2cddc21a6..2cddc21a6 100644
--- a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.docs
+++ b/debian/_base/kdeaddons/debian/konq-plugins-trinity.docs
diff --git a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.install b/debian/_base/kdeaddons/debian/konq-plugins-trinity.install
index c74edf4ce..c74edf4ce 100644
--- a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.install
+++ b/debian/_base/kdeaddons/debian/konq-plugins-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.manpages b/debian/_base/kdeaddons/debian/konq-plugins-trinity.manpages
index b33b9ee5a..b33b9ee5a 100644
--- a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.manpages
+++ b/debian/_base/kdeaddons/debian/konq-plugins-trinity.manpages
diff --git a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.menu b/debian/_base/kdeaddons/debian/konq-plugins-trinity.menu
index 0a87e945c..0a87e945c 100644
--- a/debian/squeeze/kdeaddons/debian/konq-plugins-trinity.menu
+++ b/debian/_base/kdeaddons/debian/konq-plugins-trinity.menu
diff --git a/debian/squeeze/kdeaddons/debian/kontact-plugins-trinity.install b/debian/_base/kdeaddons/debian/kontact-plugins-trinity.install
index 3571c1d1d..3571c1d1d 100644
--- a/debian/squeeze/kdeaddons/debian/kontact-plugins-trinity.install
+++ b/debian/_base/kdeaddons/debian/kontact-plugins-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/ksig-trinity.README.Debian b/debian/_base/kdeaddons/debian/ksig-trinity.README.Debian
index 0d97c94db..0d97c94db 100644
--- a/debian/squeeze/kdeaddons/debian/ksig-trinity.README.Debian
+++ b/debian/_base/kdeaddons/debian/ksig-trinity.README.Debian
diff --git a/debian/squeeze/kdeaddons/debian/ksig-trinity.install b/debian/_base/kdeaddons/debian/ksig-trinity.install
index 9f0d70be0..9f0d70be0 100644
--- a/debian/squeeze/kdeaddons/debian/ksig-trinity.install
+++ b/debian/_base/kdeaddons/debian/ksig-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/ksig-trinity.manpages b/debian/_base/kdeaddons/debian/ksig-trinity.manpages
index 2b3ef735d..2b3ef735d 100644
--- a/debian/squeeze/kdeaddons/debian/ksig-trinity.manpages
+++ b/debian/_base/kdeaddons/debian/ksig-trinity.manpages
diff --git a/debian/squeeze/kdeaddons/debian/ksig-trinity.menu b/debian/_base/kdeaddons/debian/ksig-trinity.menu
index 1b9cf2f16..1b9cf2f16 100644
--- a/debian/squeeze/kdeaddons/debian/ksig-trinity.menu
+++ b/debian/_base/kdeaddons/debian/ksig-trinity.menu
diff --git a/debian/squeeze/kdeaddons/debian/man/atlantikdesigner-trinity.1 b/debian/_base/kdeaddons/debian/man/atlantikdesigner-trinity.1
index c345fcf5b..c345fcf5b 100644
--- a/debian/squeeze/kdeaddons/debian/man/atlantikdesigner-trinity.1
+++ b/debian/_base/kdeaddons/debian/man/atlantikdesigner-trinity.1
diff --git a/debian/squeeze/kdeaddons/debian/man/exif-trinity.py.1 b/debian/_base/kdeaddons/debian/man/exif-trinity.py.1
index c71467605..c71467605 100644
--- a/debian/squeeze/kdeaddons/debian/man/exif-trinity.py.1
+++ b/debian/_base/kdeaddons/debian/man/exif-trinity.py.1
diff --git a/debian/squeeze/kdeaddons/debian/man/fsview-trinity.1 b/debian/_base/kdeaddons/debian/man/fsview-trinity.1
index cbc9afc03..cbc9afc03 100644
--- a/debian/squeeze/kdeaddons/debian/man/fsview-trinity.1
+++ b/debian/_base/kdeaddons/debian/man/fsview-trinity.1
diff --git a/debian/squeeze/kdeaddons/debian/man/jpegorient-trinity.1 b/debian/_base/kdeaddons/debian/man/jpegorient-trinity.1
index 0b01d63f6..0b01d63f6 100644
--- a/debian/squeeze/kdeaddons/debian/man/jpegorient-trinity.1
+++ b/debian/_base/kdeaddons/debian/man/jpegorient-trinity.1
diff --git a/debian/squeeze/kdeaddons/debian/man/ksig-trinity.1 b/debian/_base/kdeaddons/debian/man/ksig-trinity.1
index d88a9907b..d88a9907b 100644
--- a/debian/squeeze/kdeaddons/debian/man/ksig-trinity.1
+++ b/debian/_base/kdeaddons/debian/man/ksig-trinity.1
diff --git a/debian/squeeze/kdeaddons/debian/man/lnkforward-trinity.1 b/debian/_base/kdeaddons/debian/man/lnkforward-trinity.1
index ea3010dd8..ea3010dd8 100644
--- a/debian/squeeze/kdeaddons/debian/man/lnkforward-trinity.1
+++ b/debian/_base/kdeaddons/debian/man/lnkforward-trinity.1
diff --git a/debian/squeeze/kdeaddons/debian/man/noatunsynaescope-trinity.bin.1 b/debian/_base/kdeaddons/debian/man/noatunsynaescope-trinity.bin.1
index 14d164ea1..14d164ea1 100644
--- a/debian/squeeze/kdeaddons/debian/man/noatunsynaescope-trinity.bin.1
+++ b/debian/_base/kdeaddons/debian/man/noatunsynaescope-trinity.bin.1
diff --git a/debian/squeeze/kdeaddons/debian/man/noatuntippecanoe-trinity.bin.1 b/debian/_base/kdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
index 7e128d0e1..7e128d0e1 100644
--- a/debian/squeeze/kdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
+++ b/debian/_base/kdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
diff --git a/debian/squeeze/kdeaddons/debian/man/noatuntyler-trinity.bin.1 b/debian/_base/kdeaddons/debian/man/noatuntyler-trinity.bin.1
index 4fd35e452..4fd35e452 100644
--- a/debian/squeeze/kdeaddons/debian/man/noatuntyler-trinity.bin.1
+++ b/debian/_base/kdeaddons/debian/man/noatuntyler-trinity.bin.1
diff --git a/debian/squeeze/kdeaddons/debian/man/orient-trinity.py.1 b/debian/_base/kdeaddons/debian/man/orient-trinity.py.1
index cbdeab853..cbdeab853 100644
--- a/debian/squeeze/kdeaddons/debian/man/orient-trinity.py.1
+++ b/debian/_base/kdeaddons/debian/man/orient-trinity.py.1
diff --git a/debian/squeeze/kdeaddons/debian/noatun-plugins-trinity.docs b/debian/_base/kdeaddons/debian/noatun-plugins-trinity.docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/kdeaddons/debian/noatun-plugins-trinity.docs
+++ b/debian/_base/kdeaddons/debian/noatun-plugins-trinity.docs
diff --git a/debian/squeeze/kdeaddons/debian/noatun-plugins-trinity.install b/debian/_base/kdeaddons/debian/noatun-plugins-trinity.install
index 843bdf15c..843bdf15c 100644
--- a/debian/squeeze/kdeaddons/debian/noatun-plugins-trinity.install
+++ b/debian/_base/kdeaddons/debian/noatun-plugins-trinity.install
diff --git a/debian/squeeze/kdeaddons/debian/noatun-plugins-trinity.manpages b/debian/_base/kdeaddons/debian/noatun-plugins-trinity.manpages
index 76a3fc35b..76a3fc35b 100644
--- a/debian/squeeze/kdeaddons/debian/noatun-plugins-trinity.manpages
+++ b/debian/_base/kdeaddons/debian/noatun-plugins-trinity.manpages
diff --git a/debian/squeeze/kdeaddons/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdeaddons/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdeaddons/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdeaddons/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdeaddons/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdeaddons/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdeaddons/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdeaddons/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdeaddons/debian/patches/series b/debian/_base/kdeaddons/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdeaddons/debian/patches/series
+++ b/debian/_base/kdeaddons/debian/patches/series
diff --git a/debian/squeeze/kdeaddons/debian/rules b/debian/_base/kdeaddons/debian/rules
index 7c1c683e5..7c1c683e5 100755
--- a/debian/squeeze/kdeaddons/debian/rules
+++ b/debian/_base/kdeaddons/debian/rules
diff --git a/debian/squeeze/kdeaddons/debian/source.lintian-overrides b/debian/_base/kdeaddons/debian/source.lintian-overrides
index 842c39ad3..842c39ad3 100644
--- a/debian/squeeze/kdeaddons/debian/source.lintian-overrides
+++ b/debian/_base/kdeaddons/debian/source.lintian-overrides
diff --git a/debian/squeeze/kdeaddons/debian/source/format b/debian/_base/kdeaddons/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdeaddons/debian/source/format
+++ b/debian/_base/kdeaddons/debian/source/format
diff --git a/debian/squeeze/kdeaddons/debian/source/options b/debian/_base/kdeaddons/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdeaddons/debian/source/options
+++ b/debian/_base/kdeaddons/debian/source/options
diff --git a/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdeadmin/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdeadmin/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdeadmin/debian/cdbs/kde.mk b/debian/_base/kdeadmin/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdeadmin/debian/cdbs/kde.mk
+++ b/debian/_base/kdeadmin/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdeadmin/debian/cdbs/versions.pl b/debian/_base/kdeadmin/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdeadmin/debian/cdbs/versions.pl
+++ b/debian/_base/kdeadmin/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdeadmin/debian/changelog b/debian/_base/kdeadmin/debian/changelog
index a8257c153..a8257c153 100644
--- a/debian/squeeze/kdeadmin/debian/changelog
+++ b/debian/_base/kdeadmin/debian/changelog
diff --git a/debian/squeeze/kdeadmin/debian/compat b/debian/_base/kdeadmin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdeadmin/debian/compat
+++ b/debian/_base/kdeadmin/debian/compat
diff --git a/debian/squeeze/kdeadmin/debian/control b/debian/_base/kdeadmin/debian/control
index 0f8efa0fa..0f8efa0fa 100644
--- a/debian/squeeze/kdeadmin/debian/control
+++ b/debian/_base/kdeadmin/debian/control
diff --git a/debian/squeeze/kdeadmin/debian/copyright b/debian/_base/kdeadmin/debian/copyright
index 7d7dfaf18..7d7dfaf18 100644
--- a/debian/squeeze/kdeadmin/debian/copyright
+++ b/debian/_base/kdeadmin/debian/copyright
diff --git a/debian/squeeze/kdeadmin/debian/icons/kcron-16.xpm b/debian/_base/kdeadmin/debian/icons/kcron-16.xpm
index bfc8199a0..bfc8199a0 100644
--- a/debian/squeeze/kdeadmin/debian/icons/kcron-16.xpm
+++ b/debian/_base/kdeadmin/debian/icons/kcron-16.xpm
diff --git a/debian/squeeze/kdeadmin/debian/icons/kcron.xpm b/debian/_base/kdeadmin/debian/icons/kcron.xpm
index cbc8bef00..cbc8bef00 100644
--- a/debian/squeeze/kdeadmin/debian/icons/kcron.xpm
+++ b/debian/_base/kdeadmin/debian/icons/kcron.xpm
diff --git a/debian/squeeze/kdeadmin/debian/icons/kdat-16.xpm b/debian/_base/kdeadmin/debian/icons/kdat-16.xpm
index 03099b5f4..03099b5f4 100644
--- a/debian/squeeze/kdeadmin/debian/icons/kdat-16.xpm
+++ b/debian/_base/kdeadmin/debian/icons/kdat-16.xpm
diff --git a/debian/squeeze/kdeadmin/debian/icons/kdat.xpm b/debian/_base/kdeadmin/debian/icons/kdat.xpm
index af560d190..af560d190 100644
--- a/debian/squeeze/kdeadmin/debian/icons/kdat.xpm
+++ b/debian/_base/kdeadmin/debian/icons/kdat.xpm
diff --git a/debian/squeeze/kdeadmin/debian/icons/kpackage-16.xpm b/debian/_base/kdeadmin/debian/icons/kpackage-16.xpm
index 7e402e6fb..7e402e6fb 100644
--- a/debian/squeeze/kdeadmin/debian/icons/kpackage-16.xpm
+++ b/debian/_base/kdeadmin/debian/icons/kpackage-16.xpm
diff --git a/debian/squeeze/kdeadmin/debian/icons/kpackage.xpm b/debian/_base/kdeadmin/debian/icons/kpackage.xpm
index f18eb1f59..f18eb1f59 100644
--- a/debian/squeeze/kdeadmin/debian/icons/kpackage.xpm
+++ b/debian/_base/kdeadmin/debian/icons/kpackage.xpm
diff --git a/debian/squeeze/kdeadmin/debian/icons/ksysv-16.xpm b/debian/_base/kdeadmin/debian/icons/ksysv-16.xpm
index 3a50bc941..3a50bc941 100644
--- a/debian/squeeze/kdeadmin/debian/icons/ksysv-16.xpm
+++ b/debian/_base/kdeadmin/debian/icons/ksysv-16.xpm
diff --git a/debian/squeeze/kdeadmin/debian/icons/ksysv.xpm b/debian/_base/kdeadmin/debian/icons/ksysv.xpm
index ed55cf101..ed55cf101 100644
--- a/debian/squeeze/kdeadmin/debian/icons/ksysv.xpm
+++ b/debian/_base/kdeadmin/debian/icons/ksysv.xpm
diff --git a/debian/squeeze/kdeadmin/debian/icons/kuser-16.xpm b/debian/_base/kdeadmin/debian/icons/kuser-16.xpm
index 8bace5a27..8bace5a27 100644
--- a/debian/squeeze/kdeadmin/debian/icons/kuser-16.xpm
+++ b/debian/_base/kdeadmin/debian/icons/kuser-16.xpm
diff --git a/debian/squeeze/kdeadmin/debian/icons/kuser.xpm b/debian/_base/kdeadmin/debian/icons/kuser.xpm
index bdb97c27b..bdb97c27b 100644
--- a/debian/squeeze/kdeadmin/debian/icons/kuser.xpm
+++ b/debian/_base/kdeadmin/debian/icons/kuser.xpm
diff --git a/debian/squeeze/kdeadmin/debian/kcron-trinity.install b/debian/_base/kdeadmin/debian/kcron-trinity.install
index 45ad26a61..45ad26a61 100644
--- a/debian/squeeze/kdeadmin/debian/kcron-trinity.install
+++ b/debian/_base/kdeadmin/debian/kcron-trinity.install
diff --git a/debian/squeeze/kdeadmin/debian/kcron-trinity.manpages b/debian/_base/kdeadmin/debian/kcron-trinity.manpages
index 069c663ae..069c663ae 100644
--- a/debian/squeeze/kdeadmin/debian/kcron-trinity.manpages
+++ b/debian/_base/kdeadmin/debian/kcron-trinity.manpages
diff --git a/debian/squeeze/kdeadmin/debian/kcron-trinity.menu b/debian/_base/kdeadmin/debian/kcron-trinity.menu
index 13b9c1279..13b9c1279 100644
--- a/debian/squeeze/kdeadmin/debian/kcron-trinity.menu
+++ b/debian/_base/kdeadmin/debian/kcron-trinity.menu
diff --git a/debian/squeeze/kdeadmin/debian/kdat-trinity.install b/debian/_base/kdeadmin/debian/kdat-trinity.install
index 2f7665f37..2f7665f37 100644
--- a/debian/squeeze/kdeadmin/debian/kdat-trinity.install
+++ b/debian/_base/kdeadmin/debian/kdat-trinity.install
diff --git a/debian/squeeze/kdeadmin/debian/kdat-trinity.manpages b/debian/_base/kdeadmin/debian/kdat-trinity.manpages
index 593a2a25c..593a2a25c 100644
--- a/debian/squeeze/kdeadmin/debian/kdat-trinity.manpages
+++ b/debian/_base/kdeadmin/debian/kdat-trinity.manpages
diff --git a/debian/squeeze/kdeadmin/debian/kdat-trinity.menu b/debian/_base/kdeadmin/debian/kdat-trinity.menu
index 549b237ad..549b237ad 100644
--- a/debian/squeeze/kdeadmin/debian/kdat-trinity.menu
+++ b/debian/_base/kdeadmin/debian/kdat-trinity.menu
diff --git a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
index 5ed27d366..5ed27d366 100644
--- a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
+++ b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
diff --git a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
index b23a74fac..b23a74fac 100644
--- a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
+++ b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
diff --git a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
index ace81a59c..ace81a59c 100644
--- a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
+++ b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
diff --git a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
index 2291c2e04..2291c2e04 100644
--- a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
+++ b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
diff --git a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
index a367eb2b2..a367eb2b2 100644
--- a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
+++ b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
diff --git a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
index 8b14ff285..8b14ff285 100644
--- a/debian/squeeze/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
+++ b/debian/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
diff --git a/debian/squeeze/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install b/debian/_base/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
index e3b00f7da..e3b00f7da 100644
--- a/debian/squeeze/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
+++ b/debian/_base/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
diff --git a/debian/squeeze/kdeadmin/debian/knetworkconf-trinity.install b/debian/_base/kdeadmin/debian/knetworkconf-trinity.install
index cd5b1d3b4..cd5b1d3b4 100644
--- a/debian/squeeze/kdeadmin/debian/knetworkconf-trinity.install
+++ b/debian/_base/kdeadmin/debian/knetworkconf-trinity.install
diff --git a/debian/squeeze/kdeadmin/debian/knetworkconf-trinity.postinst b/debian/_base/kdeadmin/debian/knetworkconf-trinity.postinst
index 94012bd76..94012bd76 100644
--- a/debian/squeeze/kdeadmin/debian/knetworkconf-trinity.postinst
+++ b/debian/_base/kdeadmin/debian/knetworkconf-trinity.postinst
diff --git a/debian/squeeze/kdeadmin/debian/kpackage-trinity.install b/debian/_base/kdeadmin/debian/kpackage-trinity.install
index 20c26fbe0..20c26fbe0 100644
--- a/debian/squeeze/kdeadmin/debian/kpackage-trinity.install
+++ b/debian/_base/kdeadmin/debian/kpackage-trinity.install
diff --git a/debian/squeeze/kdeadmin/debian/kpackage-trinity.manpages b/debian/_base/kdeadmin/debian/kpackage-trinity.manpages
index ef024d1b2..ef024d1b2 100644
--- a/debian/squeeze/kdeadmin/debian/kpackage-trinity.manpages
+++ b/debian/_base/kdeadmin/debian/kpackage-trinity.manpages
diff --git a/debian/squeeze/kdeadmin/debian/kpackage-trinity.menu b/debian/_base/kdeadmin/debian/kpackage-trinity.menu
index a22bc37d3..a22bc37d3 100644
--- a/debian/squeeze/kdeadmin/debian/kpackage-trinity.menu
+++ b/debian/_base/kdeadmin/debian/kpackage-trinity.menu
diff --git a/debian/squeeze/kdeadmin/debian/kpackage-trinity.mime b/debian/_base/kdeadmin/debian/kpackage-trinity.mime
index e416e75bd..e416e75bd 100644
--- a/debian/squeeze/kdeadmin/debian/kpackage-trinity.mime
+++ b/debian/_base/kdeadmin/debian/kpackage-trinity.mime
diff --git a/debian/squeeze/kdeadmin/debian/ksysv-trinity.install b/debian/_base/kdeadmin/debian/ksysv-trinity.install
index 10cd19549..10cd19549 100644
--- a/debian/squeeze/kdeadmin/debian/ksysv-trinity.install
+++ b/debian/_base/kdeadmin/debian/ksysv-trinity.install
diff --git a/debian/squeeze/kdeadmin/debian/ksysv-trinity.manpages b/debian/_base/kdeadmin/debian/ksysv-trinity.manpages
index eac192172..eac192172 100644
--- a/debian/squeeze/kdeadmin/debian/ksysv-trinity.manpages
+++ b/debian/_base/kdeadmin/debian/ksysv-trinity.manpages
diff --git a/debian/squeeze/kdeadmin/debian/ksysv-trinity.menu b/debian/_base/kdeadmin/debian/ksysv-trinity.menu
index 74953dc41..74953dc41 100644
--- a/debian/squeeze/kdeadmin/debian/ksysv-trinity.menu
+++ b/debian/_base/kdeadmin/debian/ksysv-trinity.menu
diff --git a/debian/squeeze/kdeadmin/debian/kuser-trinity.install b/debian/_base/kdeadmin/debian/kuser-trinity.install
index a941c76e5..a941c76e5 100644
--- a/debian/squeeze/kdeadmin/debian/kuser-trinity.install
+++ b/debian/_base/kdeadmin/debian/kuser-trinity.install
diff --git a/debian/squeeze/kdeadmin/debian/kuser-trinity.manpages b/debian/_base/kdeadmin/debian/kuser-trinity.manpages
index 917414a2d..917414a2d 100644
--- a/debian/squeeze/kdeadmin/debian/kuser-trinity.manpages
+++ b/debian/_base/kdeadmin/debian/kuser-trinity.manpages
diff --git a/debian/squeeze/kdeadmin/debian/kuser-trinity.menu b/debian/_base/kdeadmin/debian/kuser-trinity.menu
index d610c6835..d610c6835 100644
--- a/debian/squeeze/kdeadmin/debian/kuser-trinity.menu
+++ b/debian/_base/kdeadmin/debian/kuser-trinity.menu
diff --git a/debian/squeeze/kdeadmin/debian/lilo-config-trinity.install b/debian/_base/kdeadmin/debian/lilo-config-trinity.install
index ca3d4e06e..ca3d4e06e 100644
--- a/debian/squeeze/kdeadmin/debian/lilo-config-trinity.install
+++ b/debian/_base/kdeadmin/debian/lilo-config-trinity.install
diff --git a/debian/squeeze/kdeadmin/debian/lilo-config-trinity.lintian b/debian/_base/kdeadmin/debian/lilo-config-trinity.lintian
index e37a33b77..e37a33b77 100644
--- a/debian/squeeze/kdeadmin/debian/lilo-config-trinity.lintian
+++ b/debian/_base/kdeadmin/debian/lilo-config-trinity.lintian
diff --git a/debian/squeeze/kdeadmin/debian/lilo-config-trinity.menu b/debian/_base/kdeadmin/debian/lilo-config-trinity.menu
index 3f2bfca36..3f2bfca36 100644
--- a/debian/squeeze/kdeadmin/debian/lilo-config-trinity.menu
+++ b/debian/_base/kdeadmin/debian/lilo-config-trinity.menu
diff --git a/debian/squeeze/kdeadmin/debian/man/kcron-trinity.sgml b/debian/_base/kdeadmin/debian/man/kcron-trinity.sgml
index 0a3f9b243..0a3f9b243 100644
--- a/debian/squeeze/kdeadmin/debian/man/kcron-trinity.sgml
+++ b/debian/_base/kdeadmin/debian/man/kcron-trinity.sgml
diff --git a/debian/squeeze/kdeadmin/debian/man/kdat-trinity.sgml b/debian/_base/kdeadmin/debian/man/kdat-trinity.sgml
index a41eee990..a41eee990 100644
--- a/debian/squeeze/kdeadmin/debian/man/kdat-trinity.sgml
+++ b/debian/_base/kdeadmin/debian/man/kdat-trinity.sgml
diff --git a/debian/squeeze/kdeadmin/debian/man/kpackage-trinity.sgml b/debian/_base/kdeadmin/debian/man/kpackage-trinity.sgml
index cd625d943..cd625d943 100644
--- a/debian/squeeze/kdeadmin/debian/man/kpackage-trinity.sgml
+++ b/debian/_base/kdeadmin/debian/man/kpackage-trinity.sgml
diff --git a/debian/squeeze/kdeadmin/debian/man/ksysv-trinity.sgml b/debian/_base/kdeadmin/debian/man/ksysv-trinity.sgml
index afa872590..afa872590 100644
--- a/debian/squeeze/kdeadmin/debian/man/ksysv-trinity.sgml
+++ b/debian/_base/kdeadmin/debian/man/ksysv-trinity.sgml
diff --git a/debian/squeeze/kdeadmin/debian/man/kuser-trinity.sgml b/debian/_base/kdeadmin/debian/man/kuser-trinity.sgml
index c9ba9ac91..c9ba9ac91 100644
--- a/debian/squeeze/kdeadmin/debian/man/kuser-trinity.sgml
+++ b/debian/_base/kdeadmin/debian/man/kuser-trinity.sgml
diff --git a/debian/squeeze/kdeadmin/debian/man/secpolicy-trinity.sgml b/debian/_base/kdeadmin/debian/man/secpolicy-trinity.sgml
index a3217d584..a3217d584 100644
--- a/debian/squeeze/kdeadmin/debian/man/secpolicy-trinity.sgml
+++ b/debian/_base/kdeadmin/debian/man/secpolicy-trinity.sgml
diff --git a/debian/squeeze/kdeadmin/debian/not-installed.list b/debian/_base/kdeadmin/debian/not-installed.list
index 22bedffe4..22bedffe4 100644
--- a/debian/squeeze/kdeadmin/debian/not-installed.list
+++ b/debian/_base/kdeadmin/debian/not-installed.list
diff --git a/debian/squeeze/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdeadmin/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdeadmin/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdeadmin/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdeadmin/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdeadmin/debian/patches/series b/debian/_base/kdeadmin/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdeadmin/debian/patches/series
+++ b/debian/_base/kdeadmin/debian/patches/series
diff --git a/debian/squeeze/kdeadmin/debian/rules b/debian/_base/kdeadmin/debian/rules
index 9a3c17683..9a3c17683 100755
--- a/debian/squeeze/kdeadmin/debian/rules
+++ b/debian/_base/kdeadmin/debian/rules
diff --git a/debian/squeeze/kdeadmin/debian/source/format b/debian/_base/kdeadmin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdeadmin/debian/source/format
+++ b/debian/_base/kdeadmin/debian/source/format
diff --git a/debian/squeeze/kdeadmin/debian/source/options b/debian/_base/kdeadmin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdeadmin/debian/source/options
+++ b/debian/_base/kdeadmin/debian/source/options
diff --git a/debian/squeeze/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 6208667e9..6208667e9 100644
--- a/debian/squeeze/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdeartwork/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdeartwork/debian/cdbs/debian-qt-kde.mk
index 5ea4b9a12..5ea4b9a12 100644
--- a/debian/squeeze/kdeartwork/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdeartwork/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdeartwork/debian/cdbs/kde.mk b/debian/_base/kdeartwork/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/debian/squeeze/kdeartwork/debian/cdbs/kde.mk
+++ b/debian/_base/kdeartwork/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdeartwork/debian/cdbs/versions.pl b/debian/_base/kdeartwork/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdeartwork/debian/cdbs/versions.pl
+++ b/debian/_base/kdeartwork/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdeartwork/debian/changelog b/debian/_base/kdeartwork/debian/changelog
index e12914d14..e12914d14 100644
--- a/debian/squeeze/kdeartwork/debian/changelog
+++ b/debian/_base/kdeartwork/debian/changelog
diff --git a/debian/squeeze/kdeartwork/debian/compat b/debian/_base/kdeartwork/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdeartwork/debian/compat
+++ b/debian/_base/kdeartwork/debian/compat
diff --git a/debian/squeeze/kdeartwork/debian/control b/debian/_base/kdeartwork/debian/control
index 258bb466a..258bb466a 100644
--- a/debian/squeeze/kdeartwork/debian/control
+++ b/debian/_base/kdeartwork/debian/control
diff --git a/debian/squeeze/kdeartwork/debian/copyright b/debian/_base/kdeartwork/debian/copyright
index ae0c0cb2d..ae0c0cb2d 100644
--- a/debian/squeeze/kdeartwork/debian/copyright
+++ b/debian/_base/kdeartwork/debian/copyright
diff --git a/debian/squeeze/kdeartwork/debian/kdeartwork-emoticons-trinity.install b/debian/_base/kdeartwork/debian/kdeartwork-emoticons-trinity.install
index 0fea42334..0fea42334 100644
--- a/debian/squeeze/kdeartwork/debian/kdeartwork-emoticons-trinity.install
+++ b/debian/_base/kdeartwork/debian/kdeartwork-emoticons-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kdeartwork-misc-trinity.install b/debian/_base/kdeartwork/debian/kdeartwork-misc-trinity.install
index 0285201e7..0285201e7 100644
--- a/debian/squeeze/kdeartwork/debian/kdeartwork-misc-trinity.install
+++ b/debian/_base/kdeartwork/debian/kdeartwork-misc-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kdeartwork-style-trinity.install b/debian/_base/kdeartwork/debian/kdeartwork-style-trinity.install
index 8fab1bcbf..8fab1bcbf 100644
--- a/debian/squeeze/kdeartwork/debian/kdeartwork-style-trinity.install
+++ b/debian/_base/kdeartwork/debian/kdeartwork-style-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kdeartwork-theme-icon-trinity.install b/debian/_base/kdeartwork/debian/kdeartwork-theme-icon-trinity.install
index 8a1dc19a0..8a1dc19a0 100644
--- a/debian/squeeze/kdeartwork/debian/kdeartwork-theme-icon-trinity.install
+++ b/debian/_base/kdeartwork/debian/kdeartwork-theme-icon-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kdeartwork-theme-window-trinity.install b/debian/_base/kdeartwork/debian/kdeartwork-theme-window-trinity.install
index 7f688e236..7f688e236 100644
--- a/debian/squeeze/kdeartwork/debian/kdeartwork-theme-window-trinity.install
+++ b/debian/_base/kdeartwork/debian/kdeartwork-theme-window-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kdeartwork.README.Debian b/debian/_base/kdeartwork/debian/kdeartwork.README.Debian
index 1b9dfa1a7..1b9dfa1a7 100644
--- a/debian/squeeze/kdeartwork/debian/kdeartwork.README.Debian
+++ b/debian/_base/kdeartwork/debian/kdeartwork.README.Debian
diff --git a/debian/squeeze/kdeartwork/debian/kdewallpapers-trinity.install b/debian/_base/kdeartwork/debian/kdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/debian/squeeze/kdeartwork/debian/kdewallpapers-trinity.install
+++ b/debian/_base/kdeartwork/debian/kdewallpapers-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-trinity.install b/debian/_base/kdeartwork/debian/kscreensaver-trinity.install
index d65c099dc..d65c099dc 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver-trinity.install
+++ b/debian/_base/kdeartwork/debian/kscreensaver-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-trinity.manpages b/debian/_base/kdeartwork/debian/kscreensaver-trinity.manpages
index 839491dbc..839491dbc 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver-trinity.manpages
+++ b/debian/_base/kdeartwork/debian/kscreensaver-trinity.manpages
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
index a3a14e04c..a3a14e04c 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
+++ b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-trinity.install
index 739e7c772..739e7c772 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install
+++ b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.manpages b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-trinity.manpages
index 356af4f32..356af4f32 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.manpages
+++ b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-trinity.manpages
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
index f11cf310b..f11cf310b 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
+++ b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian
index c3dd2d9d5..c3dd2d9d5 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian
+++ b/debian/_base/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers.README.Debian b/debian/_base/kdeartwork/debian/kscreensaver-xsavers.README.Debian
index 828861775..828861775 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers.README.Debian
+++ b/debian/_base/kdeartwork/debian/kscreensaver-xsavers.README.Debian
diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver.README.Debian b/debian/_base/kdeartwork/debian/kscreensaver.README.Debian
index 68584d330..68584d330 100644
--- a/debian/squeeze/kdeartwork/debian/kscreensaver.README.Debian
+++ b/debian/_base/kdeartwork/debian/kscreensaver.README.Debian
diff --git a/debian/squeeze/kdeartwork/debian/man/kbanner-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kbanner-trinity.kss.1
index 4c3a1964c..4c3a1964c 100644
--- a/debian/squeeze/kdeartwork/debian/man/kbanner-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kbanner-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kblob-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kblob-trinity.kss.1
index 8f2b38cff..8f2b38cff 100644
--- a/debian/squeeze/kdeartwork/debian/man/kblob-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kblob-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kclock-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kclock-trinity.kss.1
index 648f98209..648f98209 100644
--- a/debian/squeeze/kdeartwork/debian/man/kclock-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kclock-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/keuphoria-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/keuphoria-trinity.kss.1
index c9c8bada4..c9c8bada4 100644
--- a/debian/squeeze/kdeartwork/debian/man/keuphoria-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/keuphoria-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kfiresaver-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kfiresaver-trinity.kss.1
index b358c1e11..b358c1e11 100644
--- a/debian/squeeze/kdeartwork/debian/man/kfiresaver-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kfiresaver-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kflux-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kflux-trinity.kss.1
index cd27e8b6a..cd27e8b6a 100644
--- a/debian/squeeze/kdeartwork/debian/man/kflux-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kflux-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kfountain-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kfountain-trinity.kss.1
index 1f35016e9..1f35016e9 100644
--- a/debian/squeeze/kdeartwork/debian/man/kfountain-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kfountain-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kgravity-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kgravity-trinity.kss.1
index cf78f15ee..cf78f15ee 100644
--- a/debian/squeeze/kdeartwork/debian/man/kgravity-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kgravity-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/klines-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/klines-trinity.kss.1
index f67109e5c..f67109e5c 100644
--- a/debian/squeeze/kdeartwork/debian/man/klines-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/klines-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/klorenz-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/klorenz-trinity.kss.1
index 4b69e2342..4b69e2342 100644
--- a/debian/squeeze/kdeartwork/debian/man/klorenz-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/klorenz-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kpartsaver-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kpartsaver-trinity.kss.1
index 64a0a5c45..64a0a5c45 100644
--- a/debian/squeeze/kdeartwork/debian/man/kpartsaver-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kpartsaver-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kpendulum-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kpendulum-trinity.kss.1
index 8bf751d4c..8bf751d4c 100644
--- a/debian/squeeze/kdeartwork/debian/man/kpendulum-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kpendulum-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kpolygon-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kpolygon-trinity.kss.1
index 0d8d84cf3..0d8d84cf3 100644
--- a/debian/squeeze/kdeartwork/debian/man/kpolygon-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kpolygon-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/krotation-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/krotation-trinity.kss.1
index de4ca5949..de4ca5949 100644
--- a/debian/squeeze/kdeartwork/debian/man/krotation-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/krotation-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kscience-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kscience-trinity.kss.1
index fb402a11c..fb402a11c 100644
--- a/debian/squeeze/kdeartwork/debian/man/kscience-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kscience-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kslideshow-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kslideshow-trinity.kss.1
index d067494ba..d067494ba 100644
--- a/debian/squeeze/kdeartwork/debian/man/kslideshow-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kslideshow-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/ksolarwinds-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/ksolarwinds-trinity.kss.1
index cecb4bc78..cecb4bc78 100644
--- a/debian/squeeze/kdeartwork/debian/man/ksolarwinds-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/ksolarwinds-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kspace-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kspace-trinity.kss.1
index cf462ff70..cf462ff70 100644
--- a/debian/squeeze/kdeartwork/debian/man/kspace-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kspace-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kswarm-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kswarm-trinity.kss.1
index cf7818dcb..cf7818dcb 100644
--- a/debian/squeeze/kdeartwork/debian/man/kswarm-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kswarm-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kvm-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kvm-trinity.kss.1
index ba91c6bb6..ba91c6bb6 100644
--- a/debian/squeeze/kdeartwork/debian/man/kvm-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kvm-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kwave-trinity.kss.1 b/debian/_base/kdeartwork/debian/man/kwave-trinity.kss.1
index 9c6268e67..9c6268e67 100644
--- a/debian/squeeze/kdeartwork/debian/man/kwave-trinity.kss.1
+++ b/debian/_base/kdeartwork/debian/man/kwave-trinity.kss.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kxsconfig-trinity.1 b/debian/_base/kdeartwork/debian/man/kxsconfig-trinity.1
index 4db4d707b..4db4d707b 100644
--- a/debian/squeeze/kdeartwork/debian/man/kxsconfig-trinity.1
+++ b/debian/_base/kdeartwork/debian/man/kxsconfig-trinity.1
diff --git a/debian/squeeze/kdeartwork/debian/man/kxsrun-trinity.1 b/debian/_base/kdeartwork/debian/man/kxsrun-trinity.1
index 4c77abe31..4c77abe31 100644
--- a/debian/squeeze/kdeartwork/debian/man/kxsrun-trinity.1
+++ b/debian/_base/kdeartwork/debian/man/kxsrun-trinity.1
diff --git a/debian/squeeze/kdeartwork/debian/patches/series b/debian/_base/kdeartwork/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/kdeartwork/debian/patches/series
+++ b/debian/_base/kdeartwork/debian/patches/series
diff --git a/debian/squeeze/kdeartwork/debian/rules b/debian/_base/kdeartwork/debian/rules
index 3c40130e7..3c40130e7 100755
--- a/debian/squeeze/kdeartwork/debian/rules
+++ b/debian/_base/kdeartwork/debian/rules
diff --git a/debian/squeeze/kdeartwork/debian/source/format b/debian/_base/kdeartwork/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdeartwork/debian/source/format
+++ b/debian/_base/kdeartwork/debian/source/format
diff --git a/debian/squeeze/kdeartwork/debian/source/options b/debian/_base/kdeartwork/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdeartwork/debian/source/options
+++ b/debian/_base/kdeartwork/debian/source/options
diff --git a/debian/squeeze/kdebase/debian/.directory b/debian/_base/kdebase/debian/.directory
index 4bbcf2c6a..4bbcf2c6a 100644
--- a/debian/squeeze/kdebase/debian/.directory
+++ b/debian/_base/kdebase/debian/.directory
diff --git a/debian/squeeze/kdebase/debian/80ubuntu-xmodmap b/debian/_base/kdebase/debian/80ubuntu-xmodmap
index 7774dd9b8..7774dd9b8 100644
--- a/debian/squeeze/kdebase/debian/80ubuntu-xmodmap
+++ b/debian/_base/kdebase/debian/80ubuntu-xmodmap
diff --git a/debian/squeeze/kdebase/debian/KUBUNTU-DEBIAN-CHANGES b/debian/_base/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 554f855b6..554f855b6 100644
--- a/debian/squeeze/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/_base/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/debian/squeeze/kdebase/debian/NEWS b/debian/_base/kdebase/debian/NEWS
index 143897e3e..143897e3e 100644
--- a/debian/squeeze/kdebase/debian/NEWS
+++ b/debian/_base/kdebase/debian/NEWS
diff --git a/debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdebase/debian/cdbs/debian-qt-kde.mk
index 3bd77b8f7..3bd77b8f7 100644
--- a/debian/squeeze/kdebase/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdebase/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdebase/debian/cdbs/kde.mk b/debian/_base/kdebase/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/kdebase/debian/cdbs/kde.mk
+++ b/debian/_base/kdebase/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdebase/debian/cdbs/versions.pl b/debian/_base/kdebase/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdebase/debian/cdbs/versions.pl
+++ b/debian/_base/kdebase/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdebase/debian/changelog b/debian/_base/kdebase/debian/changelog
index 9742e6bde..9742e6bde 100644
--- a/debian/squeeze/kdebase/debian/changelog
+++ b/debian/_base/kdebase/debian/changelog
diff --git a/debian/squeeze/kdebase/debian/compat b/debian/_base/kdebase/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdebase/debian/compat
+++ b/debian/_base/kdebase/debian/compat
diff --git a/debian/squeeze/kdebase/debian/control b/debian/_base/kdebase/debian/control
index 74cb7c606..74cb7c606 100644
--- a/debian/squeeze/kdebase/debian/control
+++ b/debian/_base/kdebase/debian/control
diff --git a/debian/squeeze/kdebase/debian/copyright b/debian/_base/kdebase/debian/copyright
index 8e0933735..8e0933735 100644
--- a/debian/squeeze/kdebase/debian/copyright
+++ b/debian/_base/kdebase/debian/copyright
diff --git a/debian/squeeze/kdebase/debian/icons/kappfinder-16.xpm b/debian/_base/kdebase/debian/icons/kappfinder-16.xpm
index 7190943d7..7190943d7 100644
--- a/debian/squeeze/kdebase/debian/icons/kappfinder-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kappfinder-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kappfinder.xpm b/debian/_base/kdebase/debian/icons/kappfinder.xpm
index f5d7c753f..f5d7c753f 100644
--- a/debian/squeeze/kdebase/debian/icons/kappfinder.xpm
+++ b/debian/_base/kdebase/debian/icons/kappfinder.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kate-16.xpm b/debian/_base/kdebase/debian/icons/kate-16.xpm
index f77128d44..f77128d44 100644
--- a/debian/squeeze/kdebase/debian/icons/kate-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kate-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kate.xpm b/debian/_base/kdebase/debian/icons/kate.xpm
index be7d87b81..be7d87b81 100644
--- a/debian/squeeze/kdebase/debian/icons/kate.xpm
+++ b/debian/_base/kdebase/debian/icons/kate.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kcontrol-16.xpm b/debian/_base/kdebase/debian/icons/kcontrol-16.xpm
index 6597a17c4..6597a17c4 100644
--- a/debian/squeeze/kdebase/debian/icons/kcontrol-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kcontrol-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kcontrol.xpm b/debian/_base/kdebase/debian/icons/kcontrol.xpm
index 15acc56d5..15acc56d5 100644
--- a/debian/squeeze/kdebase/debian/icons/kcontrol.xpm
+++ b/debian/_base/kdebase/debian/icons/kcontrol.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kdeprint-16.xpm b/debian/_base/kdebase/debian/icons/kdeprint-16.xpm
index 4f03a0b06..4f03a0b06 100644
--- a/debian/squeeze/kdebase/debian/icons/kdeprint-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kdeprint-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kdeprint.xpm b/debian/_base/kdebase/debian/icons/kdeprint.xpm
index f11005860..f11005860 100644
--- a/debian/squeeze/kdebase/debian/icons/kdeprint.xpm
+++ b/debian/_base/kdebase/debian/icons/kdeprint.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kdeprintfax-16.xpm b/debian/_base/kdebase/debian/icons/kdeprintfax-16.xpm
index debb554b6..debb554b6 100644
--- a/debian/squeeze/kdebase/debian/icons/kdeprintfax-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kdeprintfax-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kdeprintfax.xpm b/debian/_base/kdebase/debian/icons/kdeprintfax.xpm
index 6af142f57..6af142f57 100644
--- a/debian/squeeze/kdebase/debian/icons/kdeprintfax.xpm
+++ b/debian/_base/kdebase/debian/icons/kdeprintfax.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/keditbookmarks-16.xpm b/debian/_base/kdebase/debian/icons/keditbookmarks-16.xpm
index 0006e7f3a..0006e7f3a 100644
--- a/debian/squeeze/kdebase/debian/icons/keditbookmarks-16.xpm
+++ b/debian/_base/kdebase/debian/icons/keditbookmarks-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/keditbookmarks.xpm b/debian/_base/kdebase/debian/icons/keditbookmarks.xpm
index 545b24722..545b24722 100644
--- a/debian/squeeze/kdebase/debian/icons/keditbookmarks.xpm
+++ b/debian/_base/kdebase/debian/icons/keditbookmarks.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kfind-16.xpm b/debian/_base/kdebase/debian/icons/kfind-16.xpm
index d00be036e..d00be036e 100644
--- a/debian/squeeze/kdebase/debian/icons/kfind-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kfind-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kfind.xpm b/debian/_base/kdebase/debian/icons/kfind.xpm
index 95394fe53..95394fe53 100644
--- a/debian/squeeze/kdebase/debian/icons/kfind.xpm
+++ b/debian/_base/kdebase/debian/icons/kfind.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kfm-16.xpm b/debian/_base/kdebase/debian/icons/kfm-16.xpm
index 6de4eaf08..6de4eaf08 100644
--- a/debian/squeeze/kdebase/debian/icons/kfm-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kfm-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kfm.xpm b/debian/_base/kdebase/debian/icons/kfm.xpm
index 2aa9dd403..2aa9dd403 100644
--- a/debian/squeeze/kdebase/debian/icons/kfm.xpm
+++ b/debian/_base/kdebase/debian/icons/kfm.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/khelpcenter-16.xpm b/debian/_base/kdebase/debian/icons/khelpcenter-16.xpm
index 666524486..666524486 100644
--- a/debian/squeeze/kdebase/debian/icons/khelpcenter-16.xpm
+++ b/debian/_base/kdebase/debian/icons/khelpcenter-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/khelpcenter.xpm b/debian/_base/kdebase/debian/icons/khelpcenter.xpm
index 3cfbba7bd..3cfbba7bd 100644
--- a/debian/squeeze/kdebase/debian/icons/khelpcenter.xpm
+++ b/debian/_base/kdebase/debian/icons/khelpcenter.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kicker.xpm b/debian/_base/kdebase/debian/icons/kicker.xpm
index f5fcce72c..f5fcce72c 100644
--- a/debian/squeeze/kdebase/debian/icons/kicker.xpm
+++ b/debian/_base/kdebase/debian/icons/kicker.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kinfocenter-16.xpm b/debian/_base/kdebase/debian/icons/kinfocenter-16.xpm
index 615bbf46b..615bbf46b 100644
--- a/debian/squeeze/kdebase/debian/icons/kinfocenter-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kinfocenter-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kinfocenter.xpm b/debian/_base/kdebase/debian/icons/kinfocenter.xpm
index 04fcb0013..04fcb0013 100644
--- a/debian/squeeze/kdebase/debian/icons/kinfocenter.xpm
+++ b/debian/_base/kdebase/debian/icons/kinfocenter.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kjobviewer-16.xpm b/debian/_base/kdebase/debian/icons/kjobviewer-16.xpm
index ed1bcc38f..ed1bcc38f 100644
--- a/debian/squeeze/kdebase/debian/icons/kjobviewer-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kjobviewer-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kjobviewer.xpm b/debian/_base/kdebase/debian/icons/kjobviewer.xpm
index 8ad886325..8ad886325 100644
--- a/debian/squeeze/kdebase/debian/icons/kjobviewer.xpm
+++ b/debian/_base/kdebase/debian/icons/kjobviewer.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/klipper-16.xpm b/debian/_base/kdebase/debian/icons/klipper-16.xpm
index 82115ab2a..82115ab2a 100644
--- a/debian/squeeze/kdebase/debian/icons/klipper-16.xpm
+++ b/debian/_base/kdebase/debian/icons/klipper-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/klipper.xpm b/debian/_base/kdebase/debian/icons/klipper.xpm
index aaafd1d03..aaafd1d03 100644
--- a/debian/squeeze/kdebase/debian/icons/klipper.xpm
+++ b/debian/_base/kdebase/debian/icons/klipper.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kmenuedit-16.xpm b/debian/_base/kdebase/debian/icons/kmenuedit-16.xpm
index d7af0faa8..d7af0faa8 100644
--- a/debian/squeeze/kdebase/debian/icons/kmenuedit-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kmenuedit-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kmenuedit.xpm b/debian/_base/kdebase/debian/icons/kmenuedit.xpm
index 87297263b..87297263b 100644
--- a/debian/squeeze/kdebase/debian/icons/kmenuedit.xpm
+++ b/debian/_base/kdebase/debian/icons/kmenuedit.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/konqueror-16.xpm b/debian/_base/kdebase/debian/icons/konqueror-16.xpm
index ece87a112..ece87a112 100644
--- a/debian/squeeze/kdebase/debian/icons/konqueror-16.xpm
+++ b/debian/_base/kdebase/debian/icons/konqueror-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/konqueror.xpm b/debian/_base/kdebase/debian/icons/konqueror.xpm
index 6700a9f44..6700a9f44 100644
--- a/debian/squeeze/kdebase/debian/icons/konqueror.xpm
+++ b/debian/_base/kdebase/debian/icons/konqueror.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/konsole-16.xpm b/debian/_base/kdebase/debian/icons/konsole-16.xpm
index 3be52807f..3be52807f 100644
--- a/debian/squeeze/kdebase/debian/icons/konsole-16.xpm
+++ b/debian/_base/kdebase/debian/icons/konsole-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/konsole.xpm b/debian/_base/kdebase/debian/icons/konsole.xpm
index 445cf4409..445cf4409 100644
--- a/debian/squeeze/kdebase/debian/icons/konsole.xpm
+++ b/debian/_base/kdebase/debian/icons/konsole.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kpager-16.xpm b/debian/_base/kdebase/debian/icons/kpager-16.xpm
index e9360e56f..e9360e56f 100644
--- a/debian/squeeze/kdebase/debian/icons/kpager-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kpager-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kpager.xpm b/debian/_base/kdebase/debian/icons/kpager.xpm
index 71b895ccf..71b895ccf 100644
--- a/debian/squeeze/kdebase/debian/icons/kpager.xpm
+++ b/debian/_base/kdebase/debian/icons/kpager.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kpersonalizer-16.xpm b/debian/_base/kdebase/debian/icons/kpersonalizer-16.xpm
index fab4574ac..fab4574ac 100644
--- a/debian/squeeze/kdebase/debian/icons/kpersonalizer-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kpersonalizer-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kpersonalizer.xpm b/debian/_base/kdebase/debian/icons/kpersonalizer.xpm
index 9f22bca3a..9f22bca3a 100644
--- a/debian/squeeze/kdebase/debian/icons/kpersonalizer.xpm
+++ b/debian/_base/kdebase/debian/icons/kpersonalizer.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/ksysguard-16.xpm b/debian/_base/kdebase/debian/icons/ksysguard-16.xpm
index 4ca56f859..4ca56f859 100644
--- a/debian/squeeze/kdebase/debian/icons/ksysguard-16.xpm
+++ b/debian/_base/kdebase/debian/icons/ksysguard-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/ksysguard.xpm b/debian/_base/kdebase/debian/icons/ksysguard.xpm
index a4423436a..a4423436a 100644
--- a/debian/squeeze/kdebase/debian/icons/ksysguard.xpm
+++ b/debian/_base/kdebase/debian/icons/ksysguard.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/ktip-16.xpm b/debian/_base/kdebase/debian/icons/ktip-16.xpm
index 84b879a0f..84b879a0f 100644
--- a/debian/squeeze/kdebase/debian/icons/ktip-16.xpm
+++ b/debian/_base/kdebase/debian/icons/ktip-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/ktip.xpm b/debian/_base/kdebase/debian/icons/ktip.xpm
index beda416c0..beda416c0 100644
--- a/debian/squeeze/kdebase/debian/icons/ktip.xpm
+++ b/debian/_base/kdebase/debian/icons/ktip.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kwrite-16.xpm b/debian/_base/kdebase/debian/icons/kwrite-16.xpm
index 47a6d14c2..47a6d14c2 100644
--- a/debian/squeeze/kdebase/debian/icons/kwrite-16.xpm
+++ b/debian/_base/kdebase/debian/icons/kwrite-16.xpm
diff --git a/debian/squeeze/kdebase/debian/icons/kwrite.xpm b/debian/_base/kdebase/debian/icons/kwrite.xpm
index adef05a7c..adef05a7c 100644
--- a/debian/squeeze/kdebase/debian/icons/kwrite.xpm
+++ b/debian/_base/kdebase/debian/icons/kwrite.xpm
diff --git a/debian/squeeze/kdebase/debian/img/cr128-app-energy_star.png.uu b/debian/_base/kdebase/debian/img/cr128-app-energy_star.png.uu
index 0d74bb8ef..0d74bb8ef 100644
--- a/debian/squeeze/kdebase/debian/img/cr128-app-energy_star.png.uu
+++ b/debian/_base/kdebase/debian/img/cr128-app-energy_star.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/cr16-app-energy_star.png.uu b/debian/_base/kdebase/debian/img/cr16-app-energy_star.png.uu
index 174f00947..174f00947 100644
--- a/debian/squeeze/kdebase/debian/img/cr16-app-energy_star.png.uu
+++ b/debian/_base/kdebase/debian/img/cr16-app-energy_star.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/cr32-app-energy_star.png.uu b/debian/_base/kdebase/debian/img/cr32-app-energy_star.png.uu
index 77c6322f4..77c6322f4 100644
--- a/debian/squeeze/kdebase/debian/img/cr32-app-energy_star.png.uu
+++ b/debian/_base/kdebase/debian/img/cr32-app-energy_star.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/cr48-app-energy_star.png.uu b/debian/_base/kdebase/debian/img/cr48-app-energy_star.png.uu
index 0be925842..0be925842 100644
--- a/debian/squeeze/kdebase/debian/img/cr48-app-energy_star.png.uu
+++ b/debian/_base/kdebase/debian/img/cr48-app-energy_star.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/cr64-app-energy_star.png.uu b/debian/_base/kdebase/debian/img/cr64-app-energy_star.png.uu
index 0691c9b78..0691c9b78 100644
--- a/debian/squeeze/kdebase/debian/img/cr64-app-energy_star.png.uu
+++ b/debian/_base/kdebase/debian/img/cr64-app-energy_star.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-compact_flash_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_mount_decrypt.png.uu
index e1ce7f93c..e1ce7f93c 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-compact_flash_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_decrypt.png.uu
index e120aa624..e120aa624 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu
index 1bcc196b8..1bcc196b8 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-hdd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-hdd_mount_decrypt.png.uu
index 1faca818e..1faca818e 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-hdd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-hdd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_decrypt.png.uu
index 5efdd39cf..5efdd39cf 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_encrypt.png.uu
index 001302e40..001302e40 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-memory_stick_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_mount_decrypt.png.uu
index f5b085db1..f5b085db1 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-memory_stick_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_decrypt.png.uu
index 0c4739034..0c4739034 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_encrypt.png.uu
index 5f7c14f94..5f7c14f94 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-sd_mmc_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_mount_decrypt.png.uu
index 6e7c08100..6e7c08100 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-sd_mmc_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_decrypt.png.uu
index 85c3adde8..85c3adde8 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu
index 53ba3286d..53ba3286d 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-smart_media_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_mount_decrypt.png.uu
index 6a55ab325..6a55ab325 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-smart_media_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_decrypt.png.uu
index 4f6e8724b..4f6e8724b 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_encrypt.png.uu
index fcdc11188..fcdc11188 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-usbpendrive_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_mount_decrypt.png.uu
index d8dbd0dd3..d8dbd0dd3 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-usbpendrive_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_decrypt.png.uu
index 750c23ad0..750c23ad0 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu
index 95cd850b0..95cd850b0 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdrom_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_mount_decrypt.png.uu
index 5fb99058c..5fb99058c 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdrom_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_decrypt.png.uu
index 836500512..836500512 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_encrypt.png.uu
index 0a5c93dae..0a5c93dae 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdwriter_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_mount_decrypt.png.uu
index 5a2a23edf..5a2a23edf 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdwriter_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_decrypt.png.uu
index 7fe7e8248..7fe7e8248 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_encrypt.png.uu
index 92895323f..92895323f 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-compact_flash_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_mount_decrypt.png.uu
index f8c27365d..f8c27365d 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-compact_flash_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_decrypt.png.uu
index 98e09d689..98e09d689 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_encrypt.png.uu
index bb3129191..bb3129191 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-dvd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-dvd_mount_decrypt.png.uu
index b545f7568..b545f7568 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-dvd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-dvd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_decrypt.png.uu
index 210ef348d..210ef348d 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_encrypt.png.uu
index e39a8a485..e39a8a485 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-hdd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-hdd_mount_decrypt.png.uu
index b1486c775..b1486c775 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-hdd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-hdd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_decrypt.png.uu
index d869de804..d869de804 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_encrypt.png.uu
index 354f7f21c..354f7f21c 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-memory_stick_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_mount_decrypt.png.uu
index 737470366..737470366 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-memory_stick_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_decrypt.png.uu
index 70054404b..70054404b 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_encrypt.png.uu
index 39764b3e3..39764b3e3 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-sd_mmc_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_mount_decrypt.png.uu
index 63086600f..63086600f 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-sd_mmc_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_decrypt.png.uu
index c85192622..c85192622 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_encrypt.png.uu
index 418e620e0..418e620e0 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-smart_media_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_mount_decrypt.png.uu
index 552998454..552998454 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-smart_media_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_decrypt.png.uu
index 9b076147e..9b076147e 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_encrypt.png.uu
index 69bac80c7..69bac80c7 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-usbpendrive_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_mount_decrypt.png.uu
index f1f7faa8e..f1f7faa8e 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-usbpendrive_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_decrypt.png.uu
index 075d4ea71..075d4ea71 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_encrypt.png.uu
index 953ca6b93..953ca6b93 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-compact_flash_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_mount_decrypt.png.uu
index 272ceb8cc..272ceb8cc 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-compact_flash_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_decrypt.png.uu
index 92bcedadd..92bcedadd 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_encrypt.png.uu
index 57da8caee..57da8caee 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-hdd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-hdd_mount_decrypt.png.uu
index 50e17852b..50e17852b 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-hdd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-hdd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_decrypt.png.uu
index f034e19df..f034e19df 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_encrypt.png.uu
index 0a014d451..0a014d451 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-memory_stick_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_mount_decrypt.png.uu
index 0905f771d..0905f771d 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-memory_stick_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_decrypt.png.uu
index 789b3019b..789b3019b 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_encrypt.png.uu
index 37cec5dc1..37cec5dc1 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-sd_mmc_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_mount_decrypt.png.uu
index ab84cb1a1..ab84cb1a1 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-sd_mmc_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_decrypt.png.uu
index 7885d8754..7885d8754 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_encrypt.png.uu
index 3a6f906cf..3a6f906cf 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-smart_media_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_mount_decrypt.png.uu
index 159fed5c2..159fed5c2 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-smart_media_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_decrypt.png.uu
index 17f442be9..17f442be9 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_encrypt.png.uu
index 960e92610..960e92610 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-usbpendrive_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_mount_decrypt.png.uu
index ecdd0a90c..ecdd0a90c 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-usbpendrive_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_decrypt.png.uu
index ee4921420..ee4921420 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_encrypt.png.uu
index 6f5ea1807..6f5ea1807 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdrom_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_mount_decrypt.png.uu
index 74a554911..74a554911 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdrom_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_decrypt.png.uu
index 806e8074f..806e8074f 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_encrypt.png.uu
index c8ba60fdc..c8ba60fdc 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdwriter_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_mount_decrypt.png.uu
index 18008c39c..18008c39c 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdwriter_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_decrypt.png.uu
index a30ad546c..a30ad546c 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_encrypt.png.uu
index e03914895..e03914895 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-compact_flash_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_mount_decrypt.png.uu
index 52fdf856b..52fdf856b 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-compact_flash_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_decrypt.png.uu
index 0309a9f68..0309a9f68 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_encrypt.png.uu
index 3669e8353..3669e8353 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-dvd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-dvd_mount_decrypt.png.uu
index 5029383bc..5029383bc 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-dvd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-dvd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_decrypt.png.uu
index 534e71ea5..534e71ea5 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_encrypt.png.uu
index 9f61db493..9f61db493 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-hdd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-hdd_mount_decrypt.png.uu
index be4deacb4..be4deacb4 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-hdd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-hdd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_decrypt.png.uu
index ceda221ba..ceda221ba 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_encrypt.png.uu
index ad7573d03..ad7573d03 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-memory_stick_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_mount_decrypt.png.uu
index d61c326d7..d61c326d7 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-memory_stick_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_decrypt.png.uu
index b20e824fe..b20e824fe 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_encrypt.png.uu
index ccc177262..ccc177262 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-sd_mmc_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_mount_decrypt.png.uu
index 6adfa859d..6adfa859d 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-sd_mmc_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_decrypt.png.uu
index c623b32fa..c623b32fa 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_encrypt.png.uu
index 0f7ce0a20..0f7ce0a20 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-smart_media_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_mount_decrypt.png.uu
index 46bcb9d93..46bcb9d93 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-smart_media_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_decrypt.png.uu
index 63abdf67a..63abdf67a 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_encrypt.png.uu
index bf7be270c..bf7be270c 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-usbpendrive_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_mount_decrypt.png.uu
index eb2514e60..eb2514e60 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-usbpendrive_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_decrypt.png.uu
index 8fd93cf8a..8fd93cf8a 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_encrypt.png.uu
index f1986ab2e..f1986ab2e 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdrom_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_mount_decrypt.png.uu
index 936db997e..936db997e 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdrom_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_decrypt.png.uu
index b7223ac67..b7223ac67 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_encrypt.png.uu
index 78593105d..78593105d 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdwriter_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_mount_decrypt.png.uu
index 599869d4b..599869d4b 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdwriter_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_decrypt.png.uu
index 624a60244..624a60244 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_encrypt.png.uu
index 6c25e1d03..6c25e1d03 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-compact_flash_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_mount_decrypt.png.uu
index d9e8df13c..d9e8df13c 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-compact_flash_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_decrypt.png.uu
index c334e7acd..c334e7acd 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_encrypt.png.uu
index 463332e01..463332e01 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-dvd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-dvd_mount_decrypt.png.uu
index 7a15b0e41..7a15b0e41 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-dvd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-dvd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_decrypt.png.uu
index 2fb798d26..2fb798d26 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_encrypt.png.uu
index 225ab645b..225ab645b 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-hdd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-hdd_mount_decrypt.png.uu
index e2b3f32a7..e2b3f32a7 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-hdd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-hdd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_decrypt.png.uu
index f52d063e1..f52d063e1 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_encrypt.png.uu
index 16918ac4e..16918ac4e 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-memory_stick_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_mount_decrypt.png.uu
index 2e792a850..2e792a850 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-memory_stick_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_decrypt.png.uu
index b751b85e6..b751b85e6 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_encrypt.png.uu
index 8b7eb9fdb..8b7eb9fdb 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-sd_mmc_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_mount_decrypt.png.uu
index 7c17083d4..7c17083d4 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-sd_mmc_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_decrypt.png.uu
index d381f505b..d381f505b 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_encrypt.png.uu
index 63afcf3d5..63afcf3d5 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-smart_media_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_mount_decrypt.png.uu
index afe24e0af..afe24e0af 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-smart_media_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_decrypt.png.uu
index ed026b22f..ed026b22f 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_encrypt.png.uu
index 8c2678cd9..8c2678cd9 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-usbpendrive_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_mount_decrypt.png.uu
index 72684150b..72684150b 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-usbpendrive_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_decrypt.png.uu
index 190f0cd1f..190f0cd1f 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_encrypt.png.uu
index c6bc477ae..c6bc477ae 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdrom_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_mount_decrypt.png.uu
index c8b9b7ca4..c8b9b7ca4 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdrom_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_decrypt.png.uu
index 0d0d3c11e..0d0d3c11e 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_encrypt.png.uu
index ebe585cbb..ebe585cbb 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdwriter_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_mount_decrypt.png.uu
index bcb2b8997..bcb2b8997 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdwriter_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_decrypt.png.uu
index 4911d88d8..4911d88d8 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_encrypt.png.uu
index 208cc66d2..208cc66d2 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-compact_flash_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_mount_decrypt.png.uu
index 713fc6fd6..713fc6fd6 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-compact_flash_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_decrypt.png.uu
index 7500596d4..7500596d4 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_encrypt.png.uu
index 90edd0f12..90edd0f12 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-dvd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-dvd_mount_decrypt.png.uu
index ed1fadab4..ed1fadab4 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-dvd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-dvd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_decrypt.png.uu
index 261d2e37a..261d2e37a 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_encrypt.png.uu
index dec39b151..dec39b151 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-hdd_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-hdd_mount_decrypt.png.uu
index 030abba36..030abba36 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-hdd_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-hdd_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_decrypt.png.uu
index d5627b06e..d5627b06e 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_encrypt.png.uu
index 9274c6609..9274c6609 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-memory_stick_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_mount_decrypt.png.uu
index 7e80b6f9d..7e80b6f9d 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-memory_stick_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_decrypt.png.uu
index e54571d72..e54571d72 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_encrypt.png.uu
index 491ab6c79..491ab6c79 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-sd_mmc_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_mount_decrypt.png.uu
index e3cac2e09..e3cac2e09 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-sd_mmc_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_decrypt.png.uu
index 7cd11e4f8..7cd11e4f8 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_encrypt.png.uu
index 3fd792720..3fd792720 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-smart_media_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_mount_decrypt.png.uu
index 34e05ddad..34e05ddad 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-smart_media_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_decrypt.png.uu
index 2cb7d8cdc..2cb7d8cdc 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_encrypt.png.uu
index 245e7fec0..245e7fec0 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-usbpendrive_mount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_mount_decrypt.png.uu
index a125f5101..a125f5101 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-usbpendrive_mount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_mount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_decrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_decrypt.png.uu
index b80ac75ac..b80ac75ac 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_decrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_encrypt.png.uu b/debian/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_encrypt.png.uu
index f37781c34..f37781c34 100644
--- a/debian/squeeze/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_encrypt.png.uu
+++ b/debian/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/debian/squeeze/kdebase/debian/kappfinder-trinity.install b/debian/_base/kdebase/debian/kappfinder-trinity.install
index 864092754..864092754 100644
--- a/debian/squeeze/kdebase/debian/kappfinder-trinity.install
+++ b/debian/_base/kdebase/debian/kappfinder-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kappfinder-trinity.manpages b/debian/_base/kdebase/debian/kappfinder-trinity.manpages
index b83ec9565..b83ec9565 100644
--- a/debian/squeeze/kdebase/debian/kappfinder-trinity.manpages
+++ b/debian/_base/kdebase/debian/kappfinder-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kappfinder-trinity.menu b/debian/_base/kdebase/debian/kappfinder-trinity.menu
index 597600f9e..597600f9e 100644
--- a/debian/squeeze/kdebase/debian/kappfinder-trinity.menu
+++ b/debian/_base/kdebase/debian/kappfinder-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kappfinder-trinity.postinst b/debian/_base/kdebase/debian/kappfinder-trinity.postinst
index 24b3e6df3..24b3e6df3 100644
--- a/debian/squeeze/kdebase/debian/kappfinder-trinity.postinst
+++ b/debian/_base/kdebase/debian/kappfinder-trinity.postinst
diff --git a/debian/squeeze/kdebase/debian/kate-trinity.install b/debian/_base/kdebase/debian/kate-trinity.install
index 29e4419c1..29e4419c1 100644
--- a/debian/squeeze/kdebase/debian/kate-trinity.install
+++ b/debian/_base/kdebase/debian/kate-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kate-trinity.lintian b/debian/_base/kdebase/debian/kate-trinity.lintian
index 80d27b09a..80d27b09a 100644
--- a/debian/squeeze/kdebase/debian/kate-trinity.lintian
+++ b/debian/_base/kdebase/debian/kate-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/kate-trinity.manpages b/debian/_base/kdebase/debian/kate-trinity.manpages
index 56b772103..56b772103 100644
--- a/debian/squeeze/kdebase/debian/kate-trinity.manpages
+++ b/debian/_base/kdebase/debian/kate-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kate-trinity.menu b/debian/_base/kdebase/debian/kate-trinity.menu
index 378fa940e..378fa940e 100644
--- a/debian/squeeze/kdebase/debian/kate-trinity.menu
+++ b/debian/_base/kdebase/debian/kate-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kate-trinity.mime b/debian/_base/kdebase/debian/kate-trinity.mime
index c148c7556..c148c7556 100644
--- a/debian/squeeze/kdebase/debian/kate-trinity.mime
+++ b/debian/_base/kdebase/debian/kate-trinity.mime
diff --git a/debian/squeeze/kdebase/debian/kcheckpass-trinity.pam b/debian/_base/kdebase/debian/kcheckpass-trinity.pam
index 91e91979e..91e91979e 100644
--- a/debian/squeeze/kdebase/debian/kcheckpass-trinity.pam
+++ b/debian/_base/kdebase/debian/kcheckpass-trinity.pam
diff --git a/debian/squeeze/kdebase/debian/kcontrol-trinity.README.Debian b/debian/_base/kdebase/debian/kcontrol-trinity.README.Debian
index 8c7926ad5..8c7926ad5 100644
--- a/debian/squeeze/kdebase/debian/kcontrol-trinity.README.Debian
+++ b/debian/_base/kdebase/debian/kcontrol-trinity.README.Debian
diff --git a/debian/squeeze/kdebase/debian/kcontrol-trinity.install b/debian/_base/kdebase/debian/kcontrol-trinity.install
index f337002f6..f337002f6 100644
--- a/debian/squeeze/kdebase/debian/kcontrol-trinity.install
+++ b/debian/_base/kdebase/debian/kcontrol-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kcontrol-trinity.lintian b/debian/_base/kdebase/debian/kcontrol-trinity.lintian
index 2a4306011..2a4306011 100644
--- a/debian/squeeze/kdebase/debian/kcontrol-trinity.lintian
+++ b/debian/_base/kdebase/debian/kcontrol-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/kcontrol-trinity.menu b/debian/_base/kdebase/debian/kcontrol-trinity.menu
index 7035a694c..7035a694c 100644
--- a/debian/squeeze/kdebase/debian/kcontrol-trinity.menu
+++ b/debian/_base/kdebase/debian/kcontrol-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kcontrol-trinity.postinst b/debian/_base/kdebase/debian/kcontrol-trinity.postinst
index 4733c3a43..4733c3a43 100644
--- a/debian/squeeze/kdebase/debian/kcontrol-trinity.postinst
+++ b/debian/_base/kdebase/debian/kcontrol-trinity.postinst
diff --git a/debian/squeeze/kdebase/debian/kcontrol-trinity.postrm b/debian/_base/kdebase/debian/kcontrol-trinity.postrm
index 3832d3be4..3832d3be4 100644
--- a/debian/squeeze/kdebase/debian/kcontrol-trinity.postrm
+++ b/debian/_base/kdebase/debian/kcontrol-trinity.postrm
diff --git a/debian/squeeze/kdebase/debian/kcontrol-trinity.preinst b/debian/_base/kdebase/debian/kcontrol-trinity.preinst
index 15a39d9f1..15a39d9f1 100644
--- a/debian/squeeze/kdebase/debian/kcontrol-trinity.preinst
+++ b/debian/_base/kdebase/debian/kcontrol-trinity.preinst
diff --git a/debian/squeeze/kdebase/debian/kdebase-data-trinity.install b/debian/_base/kdebase/debian/kdebase-data-trinity.install
index 22e1b5229..22e1b5229 100644
--- a/debian/squeeze/kdebase/debian/kdebase-data-trinity.install
+++ b/debian/_base/kdebase/debian/kdebase-data-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kdebase-data-trinity.preinst b/debian/_base/kdebase/debian/kdebase-data-trinity.preinst
index 87dc6edc8..87dc6edc8 100644
--- a/debian/squeeze/kdebase/debian/kdebase-data-trinity.preinst
+++ b/debian/_base/kdebase/debian/kdebase-data-trinity.preinst
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kate b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kate
index f4f9239d1..f4f9239d1 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kate
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kate
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kdeprint b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kdeprint
index 8e30926ad..8e30926ad 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kdeprint
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kdeprint
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kdm b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kdm
index 4e32f206e..4e32f206e 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kdm
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kdm
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kfind b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kfind
index 476a318e6..476a318e6 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kfind
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kfind
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kicker b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kicker
index 4bcbd8d10..4bcbd8d10 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kicker
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kicker
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.klipper b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.klipper
index 3e45ca5d9..3e45ca5d9 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.klipper
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.klipper
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kmenuedit b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kmenuedit
index adf0e7f9d..adf0e7f9d 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kmenuedit
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kmenuedit
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.konqueror b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.konqueror
index c787f146d..c787f146d 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.konqueror
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.konqueror
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.konsole b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.konsole
index 3a48ad8b9..3a48ad8b9 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.konsole
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.konsole
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kpager b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kpager
index 6e09225d5..6e09225d5 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.kpager
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.kpager
diff --git a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.ksysguard b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.ksysguard
index 769402c90..769402c90 100644
--- a/debian/squeeze/kdebase/debian/kdebase-doc-html.doc-base.ksysguard
+++ b/debian/_base/kdebase/debian/kdebase-doc-html.doc-base.ksysguard
diff --git a/debian/squeeze/kdebase/debian/kdebase-kio-plugins-trinity.README.Debian b/debian/_base/kdebase/debian/kdebase-kio-plugins-trinity.README.Debian
index b0b6e7322..b0b6e7322 100644
--- a/debian/squeeze/kdebase/debian/kdebase-kio-plugins-trinity.README.Debian
+++ b/debian/_base/kdebase/debian/kdebase-kio-plugins-trinity.README.Debian
diff --git a/debian/squeeze/kdebase/debian/kdebase-kio-plugins-trinity.install b/debian/_base/kdebase/debian/kdebase-kio-plugins-trinity.install
index 63af941c4..63af941c4 100644
--- a/debian/squeeze/kdebase/debian/kdebase-kio-plugins-trinity.install
+++ b/debian/_base/kdebase/debian/kdebase-kio-plugins-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kdebase-kio-plugins-trinity.manpages b/debian/_base/kdebase/debian/kdebase-kio-plugins-trinity.manpages
index 41ee5f29a..41ee5f29a 100644
--- a/debian/squeeze/kdebase/debian/kdebase-kio-plugins-trinity.manpages
+++ b/debian/_base/kdebase/debian/kdebase-kio-plugins-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kdebase-runtime-data-common-trinity.install b/debian/_base/kdebase/debian/kdebase-runtime-data-common-trinity.install
index e906f3a3f..e906f3a3f 100644
--- a/debian/squeeze/kdebase/debian/kdebase-runtime-data-common-trinity.install
+++ b/debian/_base/kdebase/debian/kdebase-runtime-data-common-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install b/debian/_base/kdebase/debian/kdebase-trinity-bin.install
index 4175ca1d4..4175ca1d4 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install
+++ b/debian/_base/kdebase/debian/kdebase-trinity-bin.install
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.links b/debian/_base/kdebase/debian/kdebase-trinity-bin.links
index ae21842e4..ae21842e4 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.links
+++ b/debian/_base/kdebase/debian/kdebase-trinity-bin.links
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.lintian b/debian/_base/kdebase/debian/kdebase-trinity-bin.lintian
index 9f78d69c8..9f78d69c8 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.lintian
+++ b/debian/_base/kdebase/debian/kdebase-trinity-bin.lintian
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.manpages b/debian/_base/kdebase/debian/kdebase-trinity-bin.manpages
index b801c202a..b801c202a 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.manpages
+++ b/debian/_base/kdebase/debian/kdebase-trinity-bin.manpages
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.menu b/debian/_base/kdebase/debian/kdebase-trinity-bin.menu
index 071468466..071468466 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.menu
+++ b/debian/_base/kdebase/debian/kdebase-trinity-bin.menu
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.postinst b/debian/_base/kdebase/debian/kdebase-trinity-bin.postinst
index e385c4f34..e385c4f34 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.postinst
+++ b/debian/_base/kdebase/debian/kdebase-trinity-bin.postinst
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-dev.install b/debian/_base/kdebase/debian/kdebase-trinity-dev.install
index d9759729d..d9759729d 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-dev.install
+++ b/debian/_base/kdebase/debian/kdebase-trinity-dev.install
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-doc.install b/debian/_base/kdebase/debian/kdebase-trinity-doc.install
index daa650d9d..daa650d9d 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-doc.install
+++ b/debian/_base/kdebase/debian/kdebase-trinity-doc.install
diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity.README.Debian b/debian/_base/kdebase/debian/kdebase-trinity.README.Debian
index dcdf16ecc..dcdf16ecc 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity.README.Debian
+++ b/debian/_base/kdebase/debian/kdebase-trinity.README.Debian
diff --git a/debian/squeeze/kdebase/debian/kdepasswd-trinity.install b/debian/_base/kdebase/debian/kdepasswd-trinity.install
index cbf6a5ed1..cbf6a5ed1 100644
--- a/debian/squeeze/kdebase/debian/kdepasswd-trinity.install
+++ b/debian/_base/kdebase/debian/kdepasswd-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kdepasswd-trinity.manpages b/debian/_base/kdebase/debian/kdepasswd-trinity.manpages
index 28a664117..28a664117 100644
--- a/debian/squeeze/kdebase/debian/kdepasswd-trinity.manpages
+++ b/debian/_base/kdebase/debian/kdepasswd-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kdepasswd-trinity.menu b/debian/_base/kdebase/debian/kdepasswd-trinity.menu
index 3610102c0..3610102c0 100644
--- a/debian/squeeze/kdebase/debian/kdepasswd-trinity.menu
+++ b/debian/_base/kdebase/debian/kdepasswd-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kdeprint-trinity.install b/debian/_base/kdebase/debian/kdeprint-trinity.install
index 0c4e78ef3..0c4e78ef3 100644
--- a/debian/squeeze/kdebase/debian/kdeprint-trinity.install
+++ b/debian/_base/kdebase/debian/kdeprint-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kdeprint-trinity.lintian b/debian/_base/kdebase/debian/kdeprint-trinity.lintian
index 156e04dc0..156e04dc0 100644
--- a/debian/squeeze/kdebase/debian/kdeprint-trinity.lintian
+++ b/debian/_base/kdebase/debian/kdeprint-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/kdeprint-trinity.manpages b/debian/_base/kdebase/debian/kdeprint-trinity.manpages
index 6d4136bf9..6d4136bf9 100644
--- a/debian/squeeze/kdebase/debian/kdeprint-trinity.manpages
+++ b/debian/_base/kdebase/debian/kdeprint-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kdeprint-trinity.menu b/debian/_base/kdebase/debian/kdeprint-trinity.menu
index 3140de34c..3140de34c 100644
--- a/debian/squeeze/kdebase/debian/kdeprint-trinity.menu
+++ b/debian/_base/kdebase/debian/kdeprint-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kdesktop-trinity.install b/debian/_base/kdebase/debian/kdesktop-trinity.install
index aa950c6d5..aa950c6d5 100644
--- a/debian/squeeze/kdebase/debian/kdesktop-trinity.install
+++ b/debian/_base/kdebase/debian/kdesktop-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kdesktop-trinity.lintian b/debian/_base/kdebase/debian/kdesktop-trinity.lintian
index c270fd6ae..c270fd6ae 100644
--- a/debian/squeeze/kdebase/debian/kdesktop-trinity.lintian
+++ b/debian/_base/kdebase/debian/kdesktop-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/kdesktop-trinity.preinst b/debian/_base/kdebase/debian/kdesktop-trinity.preinst
index fab4ef420..fab4ef420 100644
--- a/debian/squeeze/kdebase/debian/kdesktop-trinity.preinst
+++ b/debian/_base/kdebase/debian/kdesktop-trinity.preinst
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity-np.pam b/debian/_base/kdebase/debian/kdm-trinity-np.pam
index a13232b98..a13232b98 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity-np.pam
+++ b/debian/_base/kdebase/debian/kdm-trinity-np.pam
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.README.Debian b/debian/_base/kdebase/debian/kdm-trinity.README.Debian
index ce2e68020..ce2e68020 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.README.Debian
+++ b/debian/_base/kdebase/debian/kdm-trinity.README.Debian
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.config b/debian/_base/kdebase/debian/kdm-trinity.config
index 3525d7740..3525d7740 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.config
+++ b/debian/_base/kdebase/debian/kdm-trinity.config
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.dirs b/debian/_base/kdebase/debian/kdm-trinity.dirs
index 5a4196df0..5a4196df0 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.dirs
+++ b/debian/_base/kdebase/debian/kdm-trinity.dirs
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.init b/debian/_base/kdebase/debian/kdm-trinity.init
index a80f26d8d..a80f26d8d 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.init
+++ b/debian/_base/kdebase/debian/kdm-trinity.init
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.install b/debian/_base/kdebase/debian/kdm-trinity.install
index 7ad3f65c2..7ad3f65c2 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.install
+++ b/debian/_base/kdebase/debian/kdm-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.links b/debian/_base/kdebase/debian/kdm-trinity.links
index 6c0a7dd8b..6c0a7dd8b 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.links
+++ b/debian/_base/kdebase/debian/kdm-trinity.links
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.logrotate b/debian/_base/kdebase/debian/kdm-trinity.logrotate
index 0c7bd75ef..0c7bd75ef 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.logrotate
+++ b/debian/_base/kdebase/debian/kdm-trinity.logrotate
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.manpages b/debian/_base/kdebase/debian/kdm-trinity.manpages
index fcbc540f0..fcbc540f0 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.manpages
+++ b/debian/_base/kdebase/debian/kdm-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.pam b/debian/_base/kdebase/debian/kdm-trinity.pam
index 444884767..444884767 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.pam
+++ b/debian/_base/kdebase/debian/kdm-trinity.pam
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.postinst b/debian/_base/kdebase/debian/kdm-trinity.postinst
index 6b721b520..6b721b520 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.postinst
+++ b/debian/_base/kdebase/debian/kdm-trinity.postinst
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.postrm b/debian/_base/kdebase/debian/kdm-trinity.postrm
index b5719fadd..b5719fadd 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.postrm
+++ b/debian/_base/kdebase/debian/kdm-trinity.postrm
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.preinst b/debian/_base/kdebase/debian/kdm-trinity.preinst
index 0e6a2f68b..0e6a2f68b 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.preinst
+++ b/debian/_base/kdebase/debian/kdm-trinity.preinst
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.prerm b/debian/_base/kdebase/debian/kdm-trinity.prerm
index 640da5602..640da5602 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.prerm
+++ b/debian/_base/kdebase/debian/kdm-trinity.prerm
diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.templates b/debian/_base/kdebase/debian/kdm-trinity.templates
index 8c8e3866e..8c8e3866e 100644
--- a/debian/squeeze/kdebase/debian/kdm-trinity.templates
+++ b/debian/_base/kdebase/debian/kdm-trinity.templates
diff --git a/debian/squeeze/kdebase/debian/kfind-trinity.install b/debian/_base/kdebase/debian/kfind-trinity.install
index 88df3e87f..88df3e87f 100644
--- a/debian/squeeze/kdebase/debian/kfind-trinity.install
+++ b/debian/_base/kdebase/debian/kfind-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kfind-trinity.manpages b/debian/_base/kdebase/debian/kfind-trinity.manpages
index f0e6d9c78..f0e6d9c78 100644
--- a/debian/squeeze/kdebase/debian/kfind-trinity.manpages
+++ b/debian/_base/kdebase/debian/kfind-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kfind-trinity.menu b/debian/_base/kdebase/debian/kfind-trinity.menu
index 8763f0a87..8763f0a87 100644
--- a/debian/squeeze/kdebase/debian/kfind-trinity.menu
+++ b/debian/_base/kdebase/debian/kfind-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kfind-trinity.postinst b/debian/_base/kdebase/debian/kfind-trinity.postinst
index 1020c703e..1020c703e 100644
--- a/debian/squeeze/kdebase/debian/kfind-trinity.postinst
+++ b/debian/_base/kdebase/debian/kfind-trinity.postinst
diff --git a/debian/squeeze/kdebase/debian/khelpcenter-trinity.install b/debian/_base/kdebase/debian/khelpcenter-trinity.install
index a6d9eb374..a6d9eb374 100644
--- a/debian/squeeze/kdebase/debian/khelpcenter-trinity.install
+++ b/debian/_base/kdebase/debian/khelpcenter-trinity.install
diff --git a/debian/squeeze/kdebase/debian/khelpcenter-trinity.lintian b/debian/_base/kdebase/debian/khelpcenter-trinity.lintian
index 181e28c79..181e28c79 100644
--- a/debian/squeeze/kdebase/debian/khelpcenter-trinity.lintian
+++ b/debian/_base/kdebase/debian/khelpcenter-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/khelpcenter-trinity.menu b/debian/_base/kdebase/debian/khelpcenter-trinity.menu
index 5b1822b93..5b1822b93 100644
--- a/debian/squeeze/kdebase/debian/khelpcenter-trinity.menu
+++ b/debian/_base/kdebase/debian/khelpcenter-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kicker-trinity.install b/debian/_base/kdebase/debian/kicker-trinity.install
index 7ac93640e..7ac93640e 100644
--- a/debian/squeeze/kdebase/debian/kicker-trinity.install
+++ b/debian/_base/kdebase/debian/kicker-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kicker-trinity.lintian b/debian/_base/kdebase/debian/kicker-trinity.lintian
index 58291ed21..58291ed21 100644
--- a/debian/squeeze/kdebase/debian/kicker-trinity.lintian
+++ b/debian/_base/kdebase/debian/kicker-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/kicker-trinity.manpages b/debian/_base/kdebase/debian/kicker-trinity.manpages
index 399a3843c..399a3843c 100644
--- a/debian/squeeze/kdebase/debian/kicker-trinity.manpages
+++ b/debian/_base/kdebase/debian/kicker-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kicker-trinity.menu b/debian/_base/kdebase/debian/kicker-trinity.menu
index d945d3a4d..d945d3a4d 100644
--- a/debian/squeeze/kdebase/debian/kicker-trinity.menu
+++ b/debian/_base/kdebase/debian/kicker-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kicker-trinity.preinst b/debian/_base/kdebase/debian/kicker-trinity.preinst
index 12c94f171..12c94f171 100644
--- a/debian/squeeze/kdebase/debian/kicker-trinity.preinst
+++ b/debian/_base/kdebase/debian/kicker-trinity.preinst
diff --git a/debian/squeeze/kdebase/debian/klipper-trinity.install b/debian/_base/kdebase/debian/klipper-trinity.install
index c866c11a0..c866c11a0 100644
--- a/debian/squeeze/kdebase/debian/klipper-trinity.install
+++ b/debian/_base/kdebase/debian/klipper-trinity.install
diff --git a/debian/squeeze/kdebase/debian/klipper-trinity.lintian b/debian/_base/kdebase/debian/klipper-trinity.lintian
index 320ae2d31..320ae2d31 100644
--- a/debian/squeeze/kdebase/debian/klipper-trinity.lintian
+++ b/debian/_base/kdebase/debian/klipper-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/klipper-trinity.menu b/debian/_base/kdebase/debian/klipper-trinity.menu
index c7992a9b4..c7992a9b4 100644
--- a/debian/squeeze/kdebase/debian/klipper-trinity.menu
+++ b/debian/_base/kdebase/debian/klipper-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kmenuedit-trinity.install b/debian/_base/kdebase/debian/kmenuedit-trinity.install
index 6b816a21f..6b816a21f 100644
--- a/debian/squeeze/kdebase/debian/kmenuedit-trinity.install
+++ b/debian/_base/kdebase/debian/kmenuedit-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kmenuedit-trinity.lintian b/debian/_base/kdebase/debian/kmenuedit-trinity.lintian
index 845065f6f..845065f6f 100644
--- a/debian/squeeze/kdebase/debian/kmenuedit-trinity.lintian
+++ b/debian/_base/kdebase/debian/kmenuedit-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/kmenuedit-trinity.manpages b/debian/_base/kdebase/debian/kmenuedit-trinity.manpages
index e657bdffb..e657bdffb 100644
--- a/debian/squeeze/kdebase/debian/kmenuedit-trinity.manpages
+++ b/debian/_base/kdebase/debian/kmenuedit-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kmenuedit-trinity.menu b/debian/_base/kdebase/debian/kmenuedit-trinity.menu
index 370349760..370349760 100644
--- a/debian/squeeze/kdebase/debian/kmenuedit-trinity.menu
+++ b/debian/_base/kdebase/debian/kmenuedit-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/konqueror-nsplugins-trinity.install b/debian/_base/kdebase/debian/konqueror-nsplugins-trinity.install
index 9064613b0..9064613b0 100644
--- a/debian/squeeze/kdebase/debian/konqueror-nsplugins-trinity.install
+++ b/debian/_base/kdebase/debian/konqueror-nsplugins-trinity.install
diff --git a/debian/squeeze/kdebase/debian/konqueror-trinity.docs b/debian/_base/kdebase/debian/konqueror-trinity.docs
index c023d564b..c023d564b 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.docs
+++ b/debian/_base/kdebase/debian/konqueror-trinity.docs
diff --git a/debian/squeeze/kdebase/debian/konqueror-trinity.install b/debian/_base/kdebase/debian/konqueror-trinity.install
index 683cf364e..683cf364e 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.install
+++ b/debian/_base/kdebase/debian/konqueror-trinity.install
diff --git a/debian/squeeze/kdebase/debian/konqueror-trinity.lintian b/debian/_base/kdebase/debian/konqueror-trinity.lintian
index 2bbd4c186..2bbd4c186 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.lintian
+++ b/debian/_base/kdebase/debian/konqueror-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/konqueror-trinity.manpages b/debian/_base/kdebase/debian/konqueror-trinity.manpages
index 8097ed067..8097ed067 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.manpages
+++ b/debian/_base/kdebase/debian/konqueror-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/konqueror-trinity.menu b/debian/_base/kdebase/debian/konqueror-trinity.menu
index 6c829efaf..6c829efaf 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.menu
+++ b/debian/_base/kdebase/debian/konqueror-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/konqueror-trinity.mime b/debian/_base/kdebase/debian/konqueror-trinity.mime
index 40bfba7c7..40bfba7c7 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.mime
+++ b/debian/_base/kdebase/debian/konqueror-trinity.mime
diff --git a/debian/squeeze/kdebase/debian/konqueror-trinity.postinst b/debian/_base/kdebase/debian/konqueror-trinity.postinst
index ea83963d9..ea83963d9 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.postinst
+++ b/debian/_base/kdebase/debian/konqueror-trinity.postinst
diff --git a/debian/squeeze/kdebase/debian/konqueror-trinity.prerm b/debian/_base/kdebase/debian/konqueror-trinity.prerm
index 73baa81cc..73baa81cc 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.prerm
+++ b/debian/_base/kdebase/debian/konqueror-trinity.prerm
diff --git a/debian/squeeze/kdebase/debian/konqueror-trinity.presubj b/debian/_base/kdebase/debian/konqueror-trinity.presubj
index c82cdcb71..c82cdcb71 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.presubj
+++ b/debian/_base/kdebase/debian/konqueror-trinity.presubj
diff --git a/debian/squeeze/kdebase/debian/konsole-trinity.README.Debian b/debian/_base/kdebase/debian/konsole-trinity.README.Debian
index 82205cf2c..82205cf2c 100644
--- a/debian/squeeze/kdebase/debian/konsole-trinity.README.Debian
+++ b/debian/_base/kdebase/debian/konsole-trinity.README.Debian
diff --git a/debian/squeeze/kdebase/debian/konsole-trinity.install b/debian/_base/kdebase/debian/konsole-trinity.install
index 9cb0e6878..9cb0e6878 100644
--- a/debian/squeeze/kdebase/debian/konsole-trinity.install
+++ b/debian/_base/kdebase/debian/konsole-trinity.install
diff --git a/debian/squeeze/kdebase/debian/konsole-trinity.lintian b/debian/_base/kdebase/debian/konsole-trinity.lintian
index c050f8ca0..c050f8ca0 100644
--- a/debian/squeeze/kdebase/debian/konsole-trinity.lintian
+++ b/debian/_base/kdebase/debian/konsole-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/konsole-trinity.manpages b/debian/_base/kdebase/debian/konsole-trinity.manpages
index 8c33f637e..8c33f637e 100644
--- a/debian/squeeze/kdebase/debian/konsole-trinity.manpages
+++ b/debian/_base/kdebase/debian/konsole-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/konsole-trinity.menu b/debian/_base/kdebase/debian/konsole-trinity.menu
index 2439a78a2..2439a78a2 100644
--- a/debian/squeeze/kdebase/debian/konsole-trinity.menu
+++ b/debian/_base/kdebase/debian/konsole-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/konsole-trinity.postinst b/debian/_base/kdebase/debian/konsole-trinity.postinst
index 72cf40e83..72cf40e83 100644
--- a/debian/squeeze/kdebase/debian/konsole-trinity.postinst
+++ b/debian/_base/kdebase/debian/konsole-trinity.postinst
diff --git a/debian/squeeze/kdebase/debian/konsole-trinity.preinst b/debian/_base/kdebase/debian/konsole-trinity.preinst
index 4b167a51e..4b167a51e 100644
--- a/debian/squeeze/kdebase/debian/konsole-trinity.preinst
+++ b/debian/_base/kdebase/debian/konsole-trinity.preinst
diff --git a/debian/squeeze/kdebase/debian/konsole-trinity.prerm b/debian/_base/kdebase/debian/konsole-trinity.prerm
index 08074f5f3..08074f5f3 100644
--- a/debian/squeeze/kdebase/debian/konsole-trinity.prerm
+++ b/debian/_base/kdebase/debian/konsole-trinity.prerm
diff --git a/debian/squeeze/kdebase/debian/kpager-trinity.install b/debian/_base/kdebase/debian/kpager-trinity.install
index d9a0bb1ce..d9a0bb1ce 100644
--- a/debian/squeeze/kdebase/debian/kpager-trinity.install
+++ b/debian/_base/kdebase/debian/kpager-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kpager-trinity.manpages b/debian/_base/kdebase/debian/kpager-trinity.manpages
index b34d67959..b34d67959 100644
--- a/debian/squeeze/kdebase/debian/kpager-trinity.manpages
+++ b/debian/_base/kdebase/debian/kpager-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kpager-trinity.menu b/debian/_base/kdebase/debian/kpager-trinity.menu
index 15e3c298e..15e3c298e 100644
--- a/debian/squeeze/kdebase/debian/kpager-trinity.menu
+++ b/debian/_base/kdebase/debian/kpager-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kpersonalizer-trinity.install b/debian/_base/kdebase/debian/kpersonalizer-trinity.install
index 2a710a674..2a710a674 100644
--- a/debian/squeeze/kdebase/debian/kpersonalizer-trinity.install
+++ b/debian/_base/kdebase/debian/kpersonalizer-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kpersonalizer-trinity.manpages b/debian/_base/kdebase/debian/kpersonalizer-trinity.manpages
index bcd309b73..bcd309b73 100644
--- a/debian/squeeze/kdebase/debian/kpersonalizer-trinity.manpages
+++ b/debian/_base/kdebase/debian/kpersonalizer-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/kpersonalizer-trinity.menu b/debian/_base/kdebase/debian/kpersonalizer-trinity.menu
index fe93901c6..fe93901c6 100644
--- a/debian/squeeze/kdebase/debian/kpersonalizer-trinity.menu
+++ b/debian/_base/kdebase/debian/kpersonalizer-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kscreensaver-trinity.pam b/debian/_base/kdebase/debian/kscreensaver-trinity.pam
index 088a00503..088a00503 100644
--- a/debian/squeeze/kdebase/debian/kscreensaver-trinity.pam
+++ b/debian/_base/kdebase/debian/kscreensaver-trinity.pam
diff --git a/debian/squeeze/kdebase/debian/ksmserver-trinity.install b/debian/_base/kdebase/debian/ksmserver-trinity.install
index f5200691f..f5200691f 100644
--- a/debian/squeeze/kdebase/debian/ksmserver-trinity.install
+++ b/debian/_base/kdebase/debian/ksmserver-trinity.install
diff --git a/debian/squeeze/kdebase/debian/ksmserver-trinity.lintian b/debian/_base/kdebase/debian/ksmserver-trinity.lintian
index b246da092..b246da092 100644
--- a/debian/squeeze/kdebase/debian/ksmserver-trinity.lintian
+++ b/debian/_base/kdebase/debian/ksmserver-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/ksmserver-trinity.manpages b/debian/_base/kdebase/debian/ksmserver-trinity.manpages
index 05b93960e..05b93960e 100644
--- a/debian/squeeze/kdebase/debian/ksmserver-trinity.manpages
+++ b/debian/_base/kdebase/debian/ksmserver-trinity.manpages
diff --git a/debian/squeeze/kdebase/debian/ksmserver-trinity.postinst b/debian/_base/kdebase/debian/ksmserver-trinity.postinst
index 6492cbb59..6492cbb59 100644
--- a/debian/squeeze/kdebase/debian/ksmserver-trinity.postinst
+++ b/debian/_base/kdebase/debian/ksmserver-trinity.postinst
diff --git a/debian/squeeze/kdebase/debian/ksmserver-trinity.postrm b/debian/_base/kdebase/debian/ksmserver-trinity.postrm
index 424143ebe..424143ebe 100644
--- a/debian/squeeze/kdebase/debian/ksmserver-trinity.postrm
+++ b/debian/_base/kdebase/debian/ksmserver-trinity.postrm
diff --git a/debian/squeeze/kdebase/debian/ksmserver-trinity.preinst b/debian/_base/kdebase/debian/ksmserver-trinity.preinst
index fa106bafc..fa106bafc 100644
--- a/debian/squeeze/kdebase/debian/ksmserver-trinity.preinst
+++ b/debian/_base/kdebase/debian/ksmserver-trinity.preinst
diff --git a/debian/squeeze/kdebase/debian/ksmserver-trinity.prerm b/debian/_base/kdebase/debian/ksmserver-trinity.prerm
index cfe57810f..cfe57810f 100644
--- a/debian/squeeze/kdebase/debian/ksmserver-trinity.prerm
+++ b/debian/_base/kdebase/debian/ksmserver-trinity.prerm
diff --git a/debian/squeeze/kdebase/debian/ksplash-trinity.install b/debian/_base/kdebase/debian/ksplash-trinity.install
index 847b02505..847b02505 100644
--- a/debian/squeeze/kdebase/debian/ksplash-trinity.install
+++ b/debian/_base/kdebase/debian/ksplash-trinity.install
diff --git a/debian/squeeze/kdebase/debian/ksysguard-trinity.install b/debian/_base/kdebase/debian/ksysguard-trinity.install
index 54649197d..54649197d 100644
--- a/debian/squeeze/kdebase/debian/ksysguard-trinity.install
+++ b/debian/_base/kdebase/debian/ksysguard-trinity.install
diff --git a/debian/squeeze/kdebase/debian/ksysguard-trinity.menu b/debian/_base/kdebase/debian/ksysguard-trinity.menu
index 811fdfbeb..811fdfbeb 100644
--- a/debian/squeeze/kdebase/debian/ksysguard-trinity.menu
+++ b/debian/_base/kdebase/debian/ksysguard-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/ksysguardd-trinity.install b/debian/_base/kdebase/debian/ksysguardd-trinity.install
index 644c78911..644c78911 100644
--- a/debian/squeeze/kdebase/debian/ksysguardd-trinity.install
+++ b/debian/_base/kdebase/debian/ksysguardd-trinity.install
diff --git a/debian/squeeze/kdebase/debian/ktip-trinity.install b/debian/_base/kdebase/debian/ktip-trinity.install
index c1aa2e4b8..c1aa2e4b8 100644
--- a/debian/squeeze/kdebase/debian/ktip-trinity.install
+++ b/debian/_base/kdebase/debian/ktip-trinity.install
diff --git a/debian/squeeze/kdebase/debian/ktip-trinity.menu b/debian/_base/kdebase/debian/ktip-trinity.menu
index 0e2f320c5..0e2f320c5 100644
--- a/debian/squeeze/kdebase/debian/ktip-trinity.menu
+++ b/debian/_base/kdebase/debian/ktip-trinity.menu
diff --git a/debian/squeeze/kdebase/debian/kwin-trinity.install b/debian/_base/kdebase/debian/kwin-trinity.install
index 32b3fe34e..32b3fe34e 100644
--- a/debian/squeeze/kdebase/debian/kwin-trinity.install
+++ b/debian/_base/kdebase/debian/kwin-trinity.install
diff --git a/debian/squeeze/kdebase/debian/kwin-trinity.lintian b/debian/_base/kdebase/debian/kwin-trinity.lintian
index 12758aa76..12758aa76 100644
--- a/debian/squeeze/kdebase/debian/kwin-trinity.lintian
+++ b/debian/_base/kdebase/debian/kwin-trinity.lintian
diff --git a/debian/squeeze/kdebase/debian/kwin-trinity.postinst b/debian/_base/kdebase/debian/kwin-trinity.postinst
index 4c2228326..4c2228326 100644
--- a/debian/squeeze/kdebase/debian/kwin-trinity.postinst
+++ b/debian/_base/kdebase/debian/kwin-trinity.postinst
diff --git a/debian/squeeze/kdebase/debian/kwin-trinity.prerm b/debian/_base/kdebase/debian/kwin-trinity.prerm
index fef049114..fef049114 100644
--- a/debian/squeeze/kdebase/debian/kwin-trinity.prerm
+++ b/debian/_base/kdebase/debian/kwin-trinity.prerm
diff --git a/debian/squeeze/kdebase/debian/libkonq4-trinity-dev.install b/debian/_base/kdebase/debian/libkonq4-trinity-dev.install
index 7eb2c120e..7eb2c120e 100644
--- a/debian/squeeze/kdebase/debian/libkonq4-trinity-dev.install
+++ b/debian/_base/kdebase/debian/libkonq4-trinity-dev.install
diff --git a/debian/squeeze/kdebase/debian/libkonq4-trinity.docs b/debian/_base/kdebase/debian/libkonq4-trinity.docs
index c023d564b..c023d564b 100644
--- a/debian/squeeze/kdebase/debian/libkonq4-trinity.docs
+++ b/debian/_base/kdebase/debian/libkonq4-trinity.docs
diff --git a/debian/squeeze/kdebase/debian/libkonq4-trinity.install b/debian/_base/kdebase/debian/libkonq4-trinity.install
index 77ea07f1a..77ea07f1a 100644
--- a/debian/squeeze/kdebase/debian/libkonq4-trinity.install
+++ b/debian/_base/kdebase/debian/libkonq4-trinity.install
diff --git a/debian/squeeze/kdebase/debian/libtqt3-integration-trinity.install b/debian/_base/kdebase/debian/libtqt3-integration-trinity.install
index 9f747bbda..9f747bbda 100644
--- a/debian/squeeze/kdebase/debian/libtqt3-integration-trinity.install
+++ b/debian/_base/kdebase/debian/libtqt3-integration-trinity.install
diff --git a/debian/squeeze/kdebase/debian/local/kdm.options b/debian/_base/kdebase/debian/local/kdm.options
index 61e4c04a0..61e4c04a0 100644
--- a/debian/squeeze/kdebase/debian/local/kdm.options
+++ b/debian/_base/kdebase/debian/local/kdm.options
diff --git a/debian/squeeze/kdebase/debian/local/kdm.options.5 b/debian/_base/kdebase/debian/local/kdm.options.5
index e1ccaef2f..e1ccaef2f 100644
--- a/debian/squeeze/kdebase/debian/local/kdm.options.5
+++ b/debian/_base/kdebase/debian/local/kdm.options.5
diff --git a/debian/squeeze/kdebase/debian/man/appletproxy-trinity.1 b/debian/_base/kdebase/debian/man/appletproxy-trinity.1
index 38a96a27d..38a96a27d 100644
--- a/debian/squeeze/kdebase/debian/man/appletproxy-trinity.1
+++ b/debian/_base/kdebase/debian/man/appletproxy-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/drkonqi-trinity.1 b/debian/_base/kdebase/debian/man/drkonqi-trinity.1
index c1a7a8936..c1a7a8936 100644
--- a/debian/squeeze/kdebase/debian/man/drkonqi-trinity.1
+++ b/debian/_base/kdebase/debian/man/drkonqi-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/extensionproxy-trinity.1 b/debian/_base/kdebase/debian/man/extensionproxy-trinity.1
index 36f343ed0..36f343ed0 100644
--- a/debian/squeeze/kdebase/debian/man/extensionproxy-trinity.1
+++ b/debian/_base/kdebase/debian/man/extensionproxy-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/genkdmconf-trinity.1 b/debian/_base/kdebase/debian/man/genkdmconf-trinity.1
index e23122b89..e23122b89 100644
--- a/debian/squeeze/kdebase/debian/man/genkdmconf-trinity.1
+++ b/debian/_base/kdebase/debian/man/genkdmconf-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kappfinder-trinity.1 b/debian/_base/kdebase/debian/man/kappfinder-trinity.1
index c7ca7507c..c7ca7507c 100644
--- a/debian/squeeze/kdebase/debian/man/kappfinder-trinity.1
+++ b/debian/_base/kdebase/debian/man/kappfinder-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kasbar-trinity.1 b/debian/_base/kdebase/debian/man/kasbar-trinity.1
index f7b07efef..f7b07efef 100644
--- a/debian/squeeze/kdebase/debian/man/kasbar-trinity.1
+++ b/debian/_base/kdebase/debian/man/kasbar-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kate-trinity.1 b/debian/_base/kdebase/debian/man/kate-trinity.1
index 7f9b54d87..7f9b54d87 100644
--- a/debian/squeeze/kdebase/debian/man/kate-trinity.1
+++ b/debian/_base/kdebase/debian/man/kate-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kblankscrn.kss-trinity.1 b/debian/_base/kdebase/debian/man/kblankscrn.kss-trinity.1
index 473befef9..473befef9 100644
--- a/debian/squeeze/kdebase/debian/man/kblankscrn.kss-trinity.1
+++ b/debian/_base/kdebase/debian/man/kblankscrn.kss-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kcheckpass-trinity.1 b/debian/_base/kdebase/debian/man/kcheckpass-trinity.1
index 113074e29..113074e29 100644
--- a/debian/squeeze/kdebase/debian/man/kcheckpass-trinity.1
+++ b/debian/_base/kdebase/debian/man/kcheckpass-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kcminit-trinity.1 b/debian/_base/kdebase/debian/man/kcminit-trinity.1
index 86e4db1a4..86e4db1a4 100644
--- a/debian/squeeze/kdebase/debian/man/kcminit-trinity.1
+++ b/debian/_base/kdebase/debian/man/kcminit-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdcop-trinity.1 b/debian/_base/kdebase/debian/man/kdcop-trinity.1
index 02425c769..02425c769 100644
--- a/debian/squeeze/kdebase/debian/man/kdcop-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdcop-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdebugdialog-trinity.1 b/debian/_base/kdebase/debian/man/kdebugdialog-trinity.1
index b3b7327cf..b3b7327cf 100644
--- a/debian/squeeze/kdebase/debian/man/kdebugdialog-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdebugdialog-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdepasswd-trinity.1 b/debian/_base/kdebase/debian/man/kdepasswd-trinity.1
index 44a4128cc..44a4128cc 100644
--- a/debian/squeeze/kdebase/debian/man/kdepasswd-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdepasswd-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdeprintfax-trinity.1 b/debian/_base/kdebase/debian/man/kdeprintfax-trinity.1
index 0308ac1d8..0308ac1d8 100644
--- a/debian/squeeze/kdebase/debian/man/kdeprintfax-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdeprintfax-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdesu-trinity.1 b/debian/_base/kdebase/debian/man/kdesu-trinity.1
index e552d288c..e552d288c 100644
--- a/debian/squeeze/kdebase/debian/man/kdesu-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdesu-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdialog-trinity.1 b/debian/_base/kdebase/debian/man/kdialog-trinity.1
index fc4ccccb1..fc4ccccb1 100644
--- a/debian/squeeze/kdebase/debian/man/kdialog-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdialog-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdm-trinity.1 b/debian/_base/kdebase/debian/man/kdm-trinity.1
index e6c7a0b19..e6c7a0b19 100644
--- a/debian/squeeze/kdebase/debian/man/kdm-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdm-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdm_config-trinity.1 b/debian/_base/kdebase/debian/man/kdm_config-trinity.1
index d1cbfea1d..d1cbfea1d 100644
--- a/debian/squeeze/kdebase/debian/man/kdm_config-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdm_config-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdm_greet-trinity.1 b/debian/_base/kdebase/debian/man/kdm_greet-trinity.1
index f1607e2b1..f1607e2b1 100644
--- a/debian/squeeze/kdebase/debian/man/kdm_greet-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdm_greet-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kdmctl-trinity.1 b/debian/_base/kdebase/debian/man/kdmctl-trinity.1
index b05f09407..b05f09407 100644
--- a/debian/squeeze/kdebase/debian/man/kdmctl-trinity.1
+++ b/debian/_base/kdebase/debian/man/kdmctl-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/keditbookmarks-trinity.1 b/debian/_base/kdebase/debian/man/keditbookmarks-trinity.1
index c9562fe1d..c9562fe1d 100644
--- a/debian/squeeze/kdebase/debian/man/keditbookmarks-trinity.1
+++ b/debian/_base/kdebase/debian/man/keditbookmarks-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kfind-trinity.1 b/debian/_base/kdebase/debian/man/kfind-trinity.1
index 4eee62075..4eee62075 100644
--- a/debian/squeeze/kdebase/debian/man/kfind-trinity.1
+++ b/debian/_base/kdebase/debian/man/kfind-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kfmclient-trinity.1 b/debian/_base/kdebase/debian/man/kfmclient-trinity.1
index 193204778..193204778 100644
--- a/debian/squeeze/kdebase/debian/man/kfmclient-trinity.1
+++ b/debian/_base/kdebase/debian/man/kfmclient-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/khotkeys-trinity.1 b/debian/_base/kdebase/debian/man/khotkeys-trinity.1
index 5f6f3ffbc..5f6f3ffbc 100644
--- a/debian/squeeze/kdebase/debian/man/khotkeys-trinity.1
+++ b/debian/_base/kdebase/debian/man/khotkeys-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kicker-trinity.1 b/debian/_base/kdebase/debian/man/kicker-trinity.1
index cc48aa37d..cc48aa37d 100644
--- a/debian/squeeze/kdebase/debian/man/kicker-trinity.1
+++ b/debian/_base/kdebase/debian/man/kicker-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kio_media_mounthelper-trinity.1 b/debian/_base/kdebase/debian/man/kio_media_mounthelper-trinity.1
index 1a6fd6971..1a6fd6971 100644
--- a/debian/squeeze/kdebase/debian/man/kio_media_mounthelper-trinity.1
+++ b/debian/_base/kdebase/debian/man/kio_media_mounthelper-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kio_system_documenthelper-trinity.1 b/debian/_base/kdebase/debian/man/kio_system_documenthelper-trinity.1
index 9779578e6..9779578e6 100644
--- a/debian/squeeze/kdebase/debian/man/kio_system_documenthelper-trinity.1
+++ b/debian/_base/kdebase/debian/man/kio_system_documenthelper-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kjobviewer-trinity.1 b/debian/_base/kdebase/debian/man/kjobviewer-trinity.1
index 767d4ab1f..767d4ab1f 100644
--- a/debian/squeeze/kdebase/debian/man/kjobviewer-trinity.1
+++ b/debian/_base/kdebase/debian/man/kjobviewer-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kmenuedit-trinity.1 b/debian/_base/kdebase/debian/man/kmenuedit-trinity.1
index 7f861654a..7f861654a 100644
--- a/debian/squeeze/kdebase/debian/man/kmenuedit-trinity.1
+++ b/debian/_base/kdebase/debian/man/kmenuedit-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/knetattach-trinity.1 b/debian/_base/kdebase/debian/man/knetattach-trinity.1
index 53eb047d7..53eb047d7 100644
--- a/debian/squeeze/kdebase/debian/man/knetattach-trinity.1
+++ b/debian/_base/kdebase/debian/man/knetattach-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/konqueror-trinity.1 b/debian/_base/kdebase/debian/man/konqueror-trinity.1
index d0525d008..d0525d008 100644
--- a/debian/squeeze/kdebase/debian/man/konqueror-trinity.1
+++ b/debian/_base/kdebase/debian/man/konqueror-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/konsole-trinity.1 b/debian/_base/kdebase/debian/man/konsole-trinity.1
index 5b779fda3..5b779fda3 100644
--- a/debian/squeeze/kdebase/debian/man/konsole-trinity.1
+++ b/debian/_base/kdebase/debian/man/konsole-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kpager-trinity.1 b/debian/_base/kdebase/debian/man/kpager-trinity.1
index d704d611a..d704d611a 100644
--- a/debian/squeeze/kdebase/debian/man/kpager-trinity.1
+++ b/debian/_base/kdebase/debian/man/kpager-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kpersonalizer-trinity.1 b/debian/_base/kdebase/debian/man/kpersonalizer-trinity.1
index 311d3c4fe..311d3c4fe 100644
--- a/debian/squeeze/kdebase/debian/man/kpersonalizer-trinity.1
+++ b/debian/_base/kdebase/debian/man/kpersonalizer-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kprinter-trinity.1 b/debian/_base/kdebase/debian/man/kprinter-trinity.1
index 340bd84d1..340bd84d1 100644
--- a/debian/squeeze/kdebase/debian/man/kprinter-trinity.1
+++ b/debian/_base/kdebase/debian/man/kprinter-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/krandom.kss-trinity.1 b/debian/_base/kdebase/debian/man/krandom.kss-trinity.1
index e2aa1a141..e2aa1a141 100644
--- a/debian/squeeze/kdebase/debian/man/krandom.kss-trinity.1
+++ b/debian/_base/kdebase/debian/man/krandom.kss-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kreadconfig-trinity.1 b/debian/_base/kdebase/debian/man/kreadconfig-trinity.1
index 5bd6f869c..5bd6f869c 100644
--- a/debian/squeeze/kdebase/debian/man/kreadconfig-trinity.1
+++ b/debian/_base/kdebase/debian/man/kreadconfig-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/krootimage-trinity.1 b/debian/_base/kdebase/debian/man/krootimage-trinity.1
index 2b683c19e..2b683c19e 100644
--- a/debian/squeeze/kdebase/debian/man/krootimage-trinity.1
+++ b/debian/_base/kdebase/debian/man/krootimage-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kstart-trinity.1 b/debian/_base/kdebase/debian/man/kstart-trinity.1
index 189e6b2b2..189e6b2b2 100644
--- a/debian/squeeze/kdebase/debian/man/kstart-trinity.1
+++ b/debian/_base/kdebase/debian/man/kstart-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/ksystraycmd-trinity.1 b/debian/_base/kdebase/debian/man/ksystraycmd-trinity.1
index 73ba046e5..73ba046e5 100644
--- a/debian/squeeze/kdebase/debian/man/ksystraycmd-trinity.1
+++ b/debian/_base/kdebase/debian/man/ksystraycmd-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/ktrash-trinity.1 b/debian/_base/kdebase/debian/man/ktrash-trinity.1
index 06a844a8b..06a844a8b 100644
--- a/debian/squeeze/kdebase/debian/man/ktrash-trinity.1
+++ b/debian/_base/kdebase/debian/man/ktrash-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kwrite-trinity.1 b/debian/_base/kdebase/debian/man/kwrite-trinity.1
index 93c713176..93c713176 100644
--- a/debian/squeeze/kdebase/debian/man/kwrite-trinity.1
+++ b/debian/_base/kdebase/debian/man/kwrite-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kwriteconfig-trinity.1 b/debian/_base/kdebase/debian/man/kwriteconfig-trinity.1
index c98ebd1d4..c98ebd1d4 100644
--- a/debian/squeeze/kdebase/debian/man/kwriteconfig-trinity.1
+++ b/debian/_base/kdebase/debian/man/kwriteconfig-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/kxkb-trinity.1 b/debian/_base/kdebase/debian/man/kxkb-trinity.1
index 38a1a2a08..38a1a2a08 100644
--- a/debian/squeeze/kdebase/debian/man/kxkb-trinity.1
+++ b/debian/_base/kdebase/debian/man/kxkb-trinity.1
diff --git a/debian/squeeze/kdebase/debian/man/startkde-trinity.1 b/debian/_base/kdebase/debian/man/startkde-trinity.1
index f26b7f128..f26b7f128 100644
--- a/debian/squeeze/kdebase/debian/man/startkde-trinity.1
+++ b/debian/_base/kdebase/debian/man/startkde-trinity.1
diff --git a/debian/squeeze/kdebase/debian/not-installed.list b/debian/_base/kdebase/debian/not-installed.list
index 75f0d641a..75f0d641a 100644
--- a/debian/squeeze/kdebase/debian/not-installed.list
+++ b/debian/_base/kdebase/debian/not-installed.list
diff --git a/debian/squeeze/kdebase/debian/patches/disable_default_kdm_theme.diff b/debian/_base/kdebase/debian/patches/disable_default_kdm_theme.diff
index 918a6ac17..918a6ac17 100644
--- a/debian/squeeze/kdebase/debian/patches/disable_default_kdm_theme.diff
+++ b/debian/_base/kdebase/debian/patches/disable_default_kdm_theme.diff
diff --git a/debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff b/debian/_base/kdebase/debian/patches/disable_startkde_wallpaper.diff
index f78ecf14e..f78ecf14e 100644
--- a/debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/debian/_base/kdebase/debian/patches/disable_startkde_wallpaper.diff
diff --git a/debian/squeeze/kdebase/debian/patches/series b/debian/_base/kdebase/debian/patches/series
index 34303a0c8..34303a0c8 100644
--- a/debian/squeeze/kdebase/debian/patches/series
+++ b/debian/_base/kdebase/debian/patches/series
diff --git a/debian/squeeze/kdebase/debian/plasma-desktop.autodetect b/debian/_base/kdebase/debian/plasma-desktop.autodetect
index b083cb277..b083cb277 100755
--- a/debian/squeeze/kdebase/debian/plasma-desktop.autodetect
+++ b/debian/_base/kdebase/debian/plasma-desktop.autodetect
diff --git a/debian/squeeze/kdebase/debian/plasma.autodetect b/debian/_base/kdebase/debian/plasma.autodetect
index c23f68909..c23f68909 100755
--- a/debian/squeeze/kdebase/debian/plasma.autodetect
+++ b/debian/_base/kdebase/debian/plasma.autodetect
diff --git a/debian/squeeze/kdebase/debian/po/POTFILES.in b/debian/_base/kdebase/debian/po/POTFILES.in
index 416e5f394..416e5f394 100644
--- a/debian/squeeze/kdebase/debian/po/POTFILES.in
+++ b/debian/_base/kdebase/debian/po/POTFILES.in
diff --git a/debian/squeeze/kdebase/debian/po/ar.po b/debian/_base/kdebase/debian/po/ar.po
index 6153b4301..6153b4301 100644
--- a/debian/squeeze/kdebase/debian/po/ar.po
+++ b/debian/_base/kdebase/debian/po/ar.po
diff --git a/debian/squeeze/kdebase/debian/po/ca.po b/debian/_base/kdebase/debian/po/ca.po
index 8115f5910..8115f5910 100644
--- a/debian/squeeze/kdebase/debian/po/ca.po
+++ b/debian/_base/kdebase/debian/po/ca.po
diff --git a/debian/squeeze/kdebase/debian/po/cs.po b/debian/_base/kdebase/debian/po/cs.po
index cf3406f97..cf3406f97 100644
--- a/debian/squeeze/kdebase/debian/po/cs.po
+++ b/debian/_base/kdebase/debian/po/cs.po
diff --git a/debian/squeeze/kdebase/debian/po/da.po b/debian/_base/kdebase/debian/po/da.po
index 3cf989ee0..3cf989ee0 100644
--- a/debian/squeeze/kdebase/debian/po/da.po
+++ b/debian/_base/kdebase/debian/po/da.po
diff --git a/debian/squeeze/kdebase/debian/po/de.po b/debian/_base/kdebase/debian/po/de.po
index 71630e59d..71630e59d 100644
--- a/debian/squeeze/kdebase/debian/po/de.po
+++ b/debian/_base/kdebase/debian/po/de.po
diff --git a/debian/squeeze/kdebase/debian/po/el.po b/debian/_base/kdebase/debian/po/el.po
index c4a73a75a..c4a73a75a 100644
--- a/debian/squeeze/kdebase/debian/po/el.po
+++ b/debian/_base/kdebase/debian/po/el.po
diff --git a/debian/squeeze/kdebase/debian/po/es.po b/debian/_base/kdebase/debian/po/es.po
index 2219af271..2219af271 100644
--- a/debian/squeeze/kdebase/debian/po/es.po
+++ b/debian/_base/kdebase/debian/po/es.po
diff --git a/debian/squeeze/kdebase/debian/po/eu.po b/debian/_base/kdebase/debian/po/eu.po
index 976ce1556..976ce1556 100644
--- a/debian/squeeze/kdebase/debian/po/eu.po
+++ b/debian/_base/kdebase/debian/po/eu.po
diff --git a/debian/squeeze/kdebase/debian/po/fi.po b/debian/_base/kdebase/debian/po/fi.po
index 3fbbd16d4..3fbbd16d4 100644
--- a/debian/squeeze/kdebase/debian/po/fi.po
+++ b/debian/_base/kdebase/debian/po/fi.po
diff --git a/debian/squeeze/kdebase/debian/po/fr.po b/debian/_base/kdebase/debian/po/fr.po
index 764b3dd7d..764b3dd7d 100644
--- a/debian/squeeze/kdebase/debian/po/fr.po
+++ b/debian/_base/kdebase/debian/po/fr.po
diff --git a/debian/squeeze/kdebase/debian/po/gl.po b/debian/_base/kdebase/debian/po/gl.po
index 896b37aae..896b37aae 100644
--- a/debian/squeeze/kdebase/debian/po/gl.po
+++ b/debian/_base/kdebase/debian/po/gl.po
diff --git a/debian/squeeze/kdebase/debian/po/it.po b/debian/_base/kdebase/debian/po/it.po
index 420476257..420476257 100644
--- a/debian/squeeze/kdebase/debian/po/it.po
+++ b/debian/_base/kdebase/debian/po/it.po
diff --git a/debian/squeeze/kdebase/debian/po/ja.po b/debian/_base/kdebase/debian/po/ja.po
index d9f8d9f15..d9f8d9f15 100644
--- a/debian/squeeze/kdebase/debian/po/ja.po
+++ b/debian/_base/kdebase/debian/po/ja.po
diff --git a/debian/squeeze/kdebase/debian/po/ko.po b/debian/_base/kdebase/debian/po/ko.po
index 6200caa12..6200caa12 100644
--- a/debian/squeeze/kdebase/debian/po/ko.po
+++ b/debian/_base/kdebase/debian/po/ko.po
diff --git a/debian/squeeze/kdebase/debian/po/ml.po b/debian/_base/kdebase/debian/po/ml.po
index b4b07f9b2..b4b07f9b2 100644
--- a/debian/squeeze/kdebase/debian/po/ml.po
+++ b/debian/_base/kdebase/debian/po/ml.po
diff --git a/debian/squeeze/kdebase/debian/po/nb.po b/debian/_base/kdebase/debian/po/nb.po
index f770838af..f770838af 100644
--- a/debian/squeeze/kdebase/debian/po/nb.po
+++ b/debian/_base/kdebase/debian/po/nb.po
diff --git a/debian/squeeze/kdebase/debian/po/nl.po b/debian/_base/kdebase/debian/po/nl.po
index 9d693cc23..9d693cc23 100644
--- a/debian/squeeze/kdebase/debian/po/nl.po
+++ b/debian/_base/kdebase/debian/po/nl.po
diff --git a/debian/squeeze/kdebase/debian/po/pl.po b/debian/_base/kdebase/debian/po/pl.po
index e2f253da7..e2f253da7 100644
--- a/debian/squeeze/kdebase/debian/po/pl.po
+++ b/debian/_base/kdebase/debian/po/pl.po
diff --git a/debian/squeeze/kdebase/debian/po/pt.po b/debian/_base/kdebase/debian/po/pt.po
index 9720aa0f0..9720aa0f0 100644
--- a/debian/squeeze/kdebase/debian/po/pt.po
+++ b/debian/_base/kdebase/debian/po/pt.po
diff --git a/debian/squeeze/kdebase/debian/po/pt_BR.po b/debian/_base/kdebase/debian/po/pt_BR.po
index 8cf324e24..8cf324e24 100644
--- a/debian/squeeze/kdebase/debian/po/pt_BR.po
+++ b/debian/_base/kdebase/debian/po/pt_BR.po
diff --git a/debian/squeeze/kdebase/debian/po/ro.po b/debian/_base/kdebase/debian/po/ro.po
index 13bc24c72..13bc24c72 100644
--- a/debian/squeeze/kdebase/debian/po/ro.po
+++ b/debian/_base/kdebase/debian/po/ro.po
diff --git a/debian/squeeze/kdebase/debian/po/ru.po b/debian/_base/kdebase/debian/po/ru.po
index af8d3fb9d..af8d3fb9d 100644
--- a/debian/squeeze/kdebase/debian/po/ru.po
+++ b/debian/_base/kdebase/debian/po/ru.po
diff --git a/debian/squeeze/kdebase/debian/po/sk.po b/debian/_base/kdebase/debian/po/sk.po
index e7b350961..e7b350961 100644
--- a/debian/squeeze/kdebase/debian/po/sk.po
+++ b/debian/_base/kdebase/debian/po/sk.po
diff --git a/debian/squeeze/kdebase/debian/po/sv.po b/debian/_base/kdebase/debian/po/sv.po
index 07d0cc914..07d0cc914 100644
--- a/debian/squeeze/kdebase/debian/po/sv.po
+++ b/debian/_base/kdebase/debian/po/sv.po
diff --git a/debian/squeeze/kdebase/debian/po/ta.po b/debian/_base/kdebase/debian/po/ta.po
index 993ae3933..993ae3933 100644
--- a/debian/squeeze/kdebase/debian/po/ta.po
+++ b/debian/_base/kdebase/debian/po/ta.po
diff --git a/debian/squeeze/kdebase/debian/po/templates.pot b/debian/_base/kdebase/debian/po/templates.pot
index f8b19923e..f8b19923e 100644
--- a/debian/squeeze/kdebase/debian/po/templates.pot
+++ b/debian/_base/kdebase/debian/po/templates.pot
diff --git a/debian/squeeze/kdebase/debian/po/tr.po b/debian/_base/kdebase/debian/po/tr.po
index bc0e664d2..bc0e664d2 100644
--- a/debian/squeeze/kdebase/debian/po/tr.po
+++ b/debian/_base/kdebase/debian/po/tr.po
diff --git a/debian/squeeze/kdebase/debian/po/vi.po b/debian/_base/kdebase/debian/po/vi.po
index 0875e65e8..0875e65e8 100644
--- a/debian/squeeze/kdebase/debian/po/vi.po
+++ b/debian/_base/kdebase/debian/po/vi.po
diff --git a/debian/squeeze/kdebase/debian/po/zh_CN.po b/debian/_base/kdebase/debian/po/zh_CN.po
index 9d085dde5..9d085dde5 100644
--- a/debian/squeeze/kdebase/debian/po/zh_CN.po
+++ b/debian/_base/kdebase/debian/po/zh_CN.po
diff --git a/debian/squeeze/kdebase/debian/prune-nonfree b/debian/_base/kdebase/debian/prune-nonfree
index 4fa832d5c..4fa832d5c 100644
--- a/debian/squeeze/kdebase/debian/prune-nonfree
+++ b/debian/_base/kdebase/debian/prune-nonfree
diff --git a/debian/squeeze/kdebase/debian/rules b/debian/_base/kdebase/debian/rules
index 00893f940..00893f940 100755
--- a/debian/squeeze/kdebase/debian/rules
+++ b/debian/_base/kdebase/debian/rules
diff --git a/debian/squeeze/kdebase/debian/source.lintian-overrides b/debian/_base/kdebase/debian/source.lintian-overrides
index 1f13dc534..1f13dc534 100644
--- a/debian/squeeze/kdebase/debian/source.lintian-overrides
+++ b/debian/_base/kdebase/debian/source.lintian-overrides
diff --git a/debian/squeeze/kdebase/debian/source/format b/debian/_base/kdebase/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdebase/debian/source/format
+++ b/debian/_base/kdebase/debian/source/format
diff --git a/debian/squeeze/kdebase/debian/source/options b/debian/_base/kdebase/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdebase/debian/source/options
+++ b/debian/_base/kdebase/debian/source/options
diff --git a/debian/squeeze/kdebase/debian/ubuntu.xmodmap b/debian/_base/kdebase/debian/ubuntu.xmodmap
index 2dcca54c5..2dcca54c5 100644
--- a/debian/squeeze/kdebase/debian/ubuntu.xmodmap
+++ b/debian/_base/kdebase/debian/ubuntu.xmodmap
diff --git a/debian/squeeze/kdebase/debian/usermap.pl b/debian/_base/kdebase/debian/usermap.pl
index 9c8c61f26..9c8c61f26 100644
--- a/debian/squeeze/kdebase/debian/usermap.pl
+++ b/debian/_base/kdebase/debian/usermap.pl
diff --git a/debian/squeeze/kdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 91e47fe4d..91e47fe4d 100644
--- a/debian/squeeze/kdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdebindings/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdebindings/debian/cdbs/debian-qt-kde.mk
index 1859f6d8d..1859f6d8d 100644
--- a/debian/squeeze/kdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdebindings/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdebindings/debian/cdbs/kde.mk b/debian/_base/kdebindings/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdebindings/debian/cdbs/kde.mk
+++ b/debian/_base/kdebindings/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdebindings/debian/cdbs/versions.pl b/debian/_base/kdebindings/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdebindings/debian/cdbs/versions.pl
+++ b/debian/_base/kdebindings/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdebindings/debian/changelog b/debian/_base/kdebindings/debian/changelog
index 2379c01a4..2379c01a4 100644
--- a/debian/squeeze/kdebindings/debian/changelog
+++ b/debian/_base/kdebindings/debian/changelog
diff --git a/debian/squeeze/kdebindings/debian/compat b/debian/_base/kdebindings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdebindings/debian/compat
+++ b/debian/_base/kdebindings/debian/compat
diff --git a/debian/squeeze/kdebindings/debian/control b/debian/_base/kdebindings/debian/control
index 61ad28292..61ad28292 100644
--- a/debian/squeeze/kdebindings/debian/control
+++ b/debian/_base/kdebindings/debian/control
diff --git a/debian/squeeze/kdebindings/debian/copyright b/debian/_base/kdebindings/debian/copyright
index 40047d0f9..40047d0f9 100644
--- a/debian/squeeze/kdebindings/debian/copyright
+++ b/debian/_base/kdebindings/debian/copyright
diff --git a/debian/squeeze/kdebindings/debian/juic-trinity.install b/debian/_base/kdebindings/debian/juic-trinity.install
index b29210f2c..b29210f2c 100644
--- a/debian/squeeze/kdebindings/debian/juic-trinity.install
+++ b/debian/_base/kdebindings/debian/juic-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/juic-trinity.manpages b/debian/_base/kdebindings/debian/juic-trinity.manpages
index 3b2609197..3b2609197 100644
--- a/debian/squeeze/kdebindings/debian/juic-trinity.manpages
+++ b/debian/_base/kdebindings/debian/juic-trinity.manpages
diff --git a/debian/squeeze/kdebindings/debian/kdebindings-java-trinity.links b/debian/_base/kdebindings/debian/kdebindings-java-trinity.links
index eb432f0b9..eb432f0b9 100644
--- a/debian/squeeze/kdebindings/debian/kdebindings-java-trinity.links
+++ b/debian/_base/kdebindings/debian/kdebindings-java-trinity.links
diff --git a/debian/squeeze/kdebindings/debian/kjscmd-trinity.install b/debian/_base/kdebindings/debian/kjscmd-trinity.install
index e1bbc2e30..e1bbc2e30 100644
--- a/debian/squeeze/kdebindings/debian/kjscmd-trinity.install
+++ b/debian/_base/kdebindings/debian/kjscmd-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/kjscmd-trinity.links b/debian/_base/kdebindings/debian/kjscmd-trinity.links
index 2305663ec..2305663ec 100644
--- a/debian/squeeze/kdebindings/debian/kjscmd-trinity.links
+++ b/debian/_base/kdebindings/debian/kjscmd-trinity.links
diff --git a/debian/squeeze/kdebindings/debian/kjscmd-trinity.menu b/debian/_base/kdebindings/debian/kjscmd-trinity.menu
index 6997d23cb..6997d23cb 100644
--- a/debian/squeeze/kdebindings/debian/kjscmd-trinity.menu
+++ b/debian/_base/kdebindings/debian/kjscmd-trinity.menu
diff --git a/debian/squeeze/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install b/debian/_base/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install
index e37ad763e..e37ad763e 100644
--- a/debian/squeeze/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install
+++ b/debian/_base/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libdcop-perl-trinity.docs b/debian/_base/kdebindings/debian/libdcop-perl-trinity.docs
index 869f451fd..869f451fd 100644
--- a/debian/squeeze/kdebindings/debian/libdcop-perl-trinity.docs
+++ b/debian/_base/kdebindings/debian/libdcop-perl-trinity.docs
diff --git a/debian/squeeze/kdebindings/debian/libdcop-perl-trinity.install b/debian/_base/kdebindings/debian/libdcop-perl-trinity.install
index b01687bab..b01687bab 100644
--- a/debian/squeeze/kdebindings/debian/libdcop-perl-trinity.install
+++ b/debian/_base/kdebindings/debian/libdcop-perl-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity-dev.install b/debian/_base/kdebindings/debian/libdcop3-java-trinity-dev.install
index c1fa59ac4..c1fa59ac4 100644
--- a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity-dev.install
+++ b/debian/_base/kdebindings/debian/libdcop3-java-trinity-dev.install
diff --git a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity-dev.links b/debian/_base/kdebindings/debian/libdcop3-java-trinity-dev.links
index ad842107e..ad842107e 100644
--- a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity-dev.links
+++ b/debian/_base/kdebindings/debian/libdcop3-java-trinity-dev.links
diff --git a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity-dev.manpages b/debian/_base/kdebindings/debian/libdcop3-java-trinity-dev.manpages
index 74e63033b..74e63033b 100644
--- a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity-dev.manpages
+++ b/debian/_base/kdebindings/debian/libdcop3-java-trinity-dev.manpages
diff --git a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity.install b/debian/_base/kdebindings/debian/libdcop3-java-trinity.install
index 024aecc38..024aecc38 100644
--- a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity.install
+++ b/debian/_base/kdebindings/debian/libdcop3-java-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity.links b/debian/_base/kdebindings/debian/libdcop3-java-trinity.links
index 15127ed24..15127ed24 100644
--- a/debian/squeeze/kdebindings/debian/libdcop3-java-trinity.links
+++ b/debian/_base/kdebindings/debian/libdcop3-java-trinity.links
diff --git a/debian/squeeze/kdebindings/debian/libdcop3-jni-trinity.install b/debian/_base/kdebindings/debian/libdcop3-jni-trinity.install
index 99f72f148..99f72f148 100644
--- a/debian/squeeze/kdebindings/debian/libdcop3-jni-trinity.install
+++ b/debian/_base/kdebindings/debian/libdcop3-jni-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libkjsembed-trinity-dev.dirs b/debian/_base/kdebindings/debian/libkjsembed-trinity-dev.dirs
index f9e762e38..f9e762e38 100644
--- a/debian/squeeze/kdebindings/debian/libkjsembed-trinity-dev.dirs
+++ b/debian/_base/kdebindings/debian/libkjsembed-trinity-dev.dirs
diff --git a/debian/squeeze/kdebindings/debian/libkjsembed-trinity-dev.docs b/debian/_base/kdebindings/debian/libkjsembed-trinity-dev.docs
index bd723f85c..bd723f85c 100644
--- a/debian/squeeze/kdebindings/debian/libkjsembed-trinity-dev.docs
+++ b/debian/_base/kdebindings/debian/libkjsembed-trinity-dev.docs
diff --git a/debian/squeeze/kdebindings/debian/libkjsembed-trinity-dev.install b/debian/_base/kdebindings/debian/libkjsembed-trinity-dev.install
index 62a36de6e..62a36de6e 100644
--- a/debian/squeeze/kdebindings/debian/libkjsembed-trinity-dev.install
+++ b/debian/_base/kdebindings/debian/libkjsembed-trinity-dev.install
diff --git a/debian/squeeze/kdebindings/debian/libkjsembed-trinity-dev.links b/debian/_base/kdebindings/debian/libkjsembed-trinity-dev.links
index a9e53e9a4..a9e53e9a4 100644
--- a/debian/squeeze/kdebindings/debian/libkjsembed-trinity-dev.links
+++ b/debian/_base/kdebindings/debian/libkjsembed-trinity-dev.links
diff --git a/debian/squeeze/kdebindings/debian/libkjsembed1-trinity.docs b/debian/_base/kdebindings/debian/libkjsembed1-trinity.docs
index 4c40dd769..4c40dd769 100644
--- a/debian/squeeze/kdebindings/debian/libkjsembed1-trinity.docs
+++ b/debian/_base/kdebindings/debian/libkjsembed1-trinity.docs
diff --git a/debian/squeeze/kdebindings/debian/libkjsembed1-trinity.install b/debian/_base/kdebindings/debian/libkjsembed1-trinity.install
index c0fe0bc67..c0fe0bc67 100644
--- a/debian/squeeze/kdebindings/debian/libkjsembed1-trinity.install
+++ b/debian/_base/kdebindings/debian/libkjsembed1-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.docs b/debian/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.docs
index fcf01a118..fcf01a118 100644
--- a/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.docs
+++ b/debian/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.docs
diff --git a/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.install
index d34b2b006..d34b2b006 100644
--- a/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/debian/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.manpages b/debian/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
index 0dcb02444..0dcb02444 100644
--- a/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
+++ b/debian/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
diff --git a/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.docs b/debian/_base/kdebindings/debian/libqt0-ruby1.8-trinity.docs
index a6f9fffce..a6f9fffce 100644
--- a/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.docs
+++ b/debian/_base/kdebindings/debian/libqt0-ruby1.8-trinity.docs
diff --git a/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/_base/kdebindings/debian/libqt0-ruby1.8-trinity.install
index 91bc7c692..91bc7c692 100644
--- a/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/debian/_base/kdebindings/debian/libqt0-ruby1.8-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.manpages b/debian/_base/kdebindings/debian/libqt0-ruby1.8-trinity.manpages
index f2dc6de31..f2dc6de31 100644
--- a/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.manpages
+++ b/debian/_base/kdebindings/debian/libqt0-ruby1.8-trinity.manpages
diff --git a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.README.Debian b/debian/_base/kdebindings/debian/libqt3-java-trinity.README.Debian
index bfba13c88..bfba13c88 100644
--- a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.README.Debian
+++ b/debian/_base/kdebindings/debian/libqt3-java-trinity.README.Debian
diff --git a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.dirs b/debian/_base/kdebindings/debian/libqt3-java-trinity.dirs
index 9fe145a6d..9fe145a6d 100644
--- a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.dirs
+++ b/debian/_base/kdebindings/debian/libqt3-java-trinity.dirs
diff --git a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.docs b/debian/_base/kdebindings/debian/libqt3-java-trinity.docs
index b10168041..b10168041 100644
--- a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.docs
+++ b/debian/_base/kdebindings/debian/libqt3-java-trinity.docs
diff --git a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.install b/debian/_base/kdebindings/debian/libqt3-java-trinity.install
index 0b068bc53..0b068bc53 100644
--- a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.install
+++ b/debian/_base/kdebindings/debian/libqt3-java-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.links b/debian/_base/kdebindings/debian/libqt3-java-trinity.links
index 04f3160e8..04f3160e8 100644
--- a/debian/squeeze/kdebindings/debian/libqt3-java-trinity.links
+++ b/debian/_base/kdebindings/debian/libqt3-java-trinity.links
diff --git a/debian/squeeze/kdebindings/debian/libqt3-jni-trinity.docs b/debian/_base/kdebindings/debian/libqt3-jni-trinity.docs
index 90a6f2219..90a6f2219 100644
--- a/debian/squeeze/kdebindings/debian/libqt3-jni-trinity.docs
+++ b/debian/_base/kdebindings/debian/libqt3-jni-trinity.docs
diff --git a/debian/squeeze/kdebindings/debian/libqt3-jni-trinity.install b/debian/_base/kdebindings/debian/libqt3-jni-trinity.install
index 0c879683b..0c879683b 100644
--- a/debian/squeeze/kdebindings/debian/libqt3-jni-trinity.install
+++ b/debian/_base/kdebindings/debian/libqt3-jni-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libsmokekde-trinity-dev.install b/debian/_base/kdebindings/debian/libsmokekde-trinity-dev.install
index 85021cc40..85021cc40 100644
--- a/debian/squeeze/kdebindings/debian/libsmokekde-trinity-dev.install
+++ b/debian/_base/kdebindings/debian/libsmokekde-trinity-dev.install
diff --git a/debian/squeeze/kdebindings/debian/libsmokekde-trinity-dev.links b/debian/_base/kdebindings/debian/libsmokekde-trinity-dev.links
index da4b8e1a2..da4b8e1a2 100644
--- a/debian/squeeze/kdebindings/debian/libsmokekde-trinity-dev.links
+++ b/debian/_base/kdebindings/debian/libsmokekde-trinity-dev.links
diff --git a/debian/squeeze/kdebindings/debian/libsmokekde1-trinity.install b/debian/_base/kdebindings/debian/libsmokekde1-trinity.install
index 173913313..173913313 100644
--- a/debian/squeeze/kdebindings/debian/libsmokekde1-trinity.install
+++ b/debian/_base/kdebindings/debian/libsmokekde1-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libsmokeqt-trinity-dev.install b/debian/_base/kdebindings/debian/libsmokeqt-trinity-dev.install
index 2904a6815..2904a6815 100644
--- a/debian/squeeze/kdebindings/debian/libsmokeqt-trinity-dev.install
+++ b/debian/_base/kdebindings/debian/libsmokeqt-trinity-dev.install
diff --git a/debian/squeeze/kdebindings/debian/libsmokeqt-trinity-dev.links b/debian/_base/kdebindings/debian/libsmokeqt-trinity-dev.links
index ba0272c14..ba0272c14 100644
--- a/debian/squeeze/kdebindings/debian/libsmokeqt-trinity-dev.links
+++ b/debian/_base/kdebindings/debian/libsmokeqt-trinity-dev.links
diff --git a/debian/squeeze/kdebindings/debian/libsmokeqt1-trinity.install b/debian/_base/kdebindings/debian/libsmokeqt1-trinity.install
index 3bf2b300b..3bf2b300b 100644
--- a/debian/squeeze/kdebindings/debian/libsmokeqt1-trinity.install
+++ b/debian/_base/kdebindings/debian/libsmokeqt1-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.README.Debian b/debian/_base/kdebindings/debian/libtrinity-java-trinity.README.Debian
index 7b0f5a847..7b0f5a847 100644
--- a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.README.Debian
+++ b/debian/_base/kdebindings/debian/libtrinity-java-trinity.README.Debian
diff --git a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.dirs b/debian/_base/kdebindings/debian/libtrinity-java-trinity.dirs
index 02807ba4b..02807ba4b 100644
--- a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.dirs
+++ b/debian/_base/kdebindings/debian/libtrinity-java-trinity.dirs
diff --git a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.docs b/debian/_base/kdebindings/debian/libtrinity-java-trinity.docs
index 6f113fce7..6f113fce7 100644
--- a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.docs
+++ b/debian/_base/kdebindings/debian/libtrinity-java-trinity.docs
diff --git a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.install b/debian/_base/kdebindings/debian/libtrinity-java-trinity.install
index 9ea8f63c7..9ea8f63c7 100644
--- a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.install
+++ b/debian/_base/kdebindings/debian/libtrinity-java-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.links b/debian/_base/kdebindings/debian/libtrinity-java-trinity.links
index 3d5d71d6a..3d5d71d6a 100644
--- a/debian/squeeze/kdebindings/debian/libtrinity-java-trinity.links
+++ b/debian/_base/kdebindings/debian/libtrinity-java-trinity.links
diff --git a/debian/squeeze/kdebindings/debian/libtrinity-jni-trinity.docs b/debian/_base/kdebindings/debian/libtrinity-jni-trinity.docs
index 56222195b..56222195b 100644
--- a/debian/squeeze/kdebindings/debian/libtrinity-jni-trinity.docs
+++ b/debian/_base/kdebindings/debian/libtrinity-jni-trinity.docs
diff --git a/debian/squeeze/kdebindings/debian/libtrinity-jni-trinity.install b/debian/_base/kdebindings/debian/libtrinity-jni-trinity.install
index 0c661dcee..0c661dcee 100644
--- a/debian/squeeze/kdebindings/debian/libtrinity-jni-trinity.install
+++ b/debian/_base/kdebindings/debian/libtrinity-jni-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/local/dcopidl2java.1 b/debian/_base/kdebindings/debian/local/dcopidl2java.1
index 926d78391..926d78391 100644
--- a/debian/squeeze/kdebindings/debian/local/dcopidl2java.1
+++ b/debian/_base/kdebindings/debian/local/dcopidl2java.1
diff --git a/debian/squeeze/kdebindings/debian/local/juic.1 b/debian/_base/kdebindings/debian/local/juic.1
index 08aba74f8..08aba74f8 100644
--- a/debian/squeeze/kdebindings/debian/local/juic.1
+++ b/debian/_base/kdebindings/debian/local/juic.1
diff --git a/debian/squeeze/kdebindings/debian/local/krubyinit.1 b/debian/_base/kdebindings/debian/local/krubyinit.1
index 21cd93112..21cd93112 100644
--- a/debian/squeeze/kdebindings/debian/local/krubyinit.1
+++ b/debian/_base/kdebindings/debian/local/krubyinit.1
diff --git a/debian/squeeze/kdebindings/debian/local/qtrubyinit.1 b/debian/_base/kdebindings/debian/local/qtrubyinit.1
index 61a505863..61a505863 100644
--- a/debian/squeeze/kdebindings/debian/local/qtrubyinit.1
+++ b/debian/_base/kdebindings/debian/local/qtrubyinit.1
diff --git a/debian/squeeze/kdebindings/debian/local/rbkdeapi.1 b/debian/_base/kdebindings/debian/local/rbkdeapi.1
index ba6772436..ba6772436 100644
--- a/debian/squeeze/kdebindings/debian/local/rbkdeapi.1
+++ b/debian/_base/kdebindings/debian/local/rbkdeapi.1
diff --git a/debian/squeeze/kdebindings/debian/local/rbkdesh.1 b/debian/_base/kdebindings/debian/local/rbkdesh.1
index 1fd7b6784..1fd7b6784 100644
--- a/debian/squeeze/kdebindings/debian/local/rbkdesh.1
+++ b/debian/_base/kdebindings/debian/local/rbkdesh.1
diff --git a/debian/squeeze/kdebindings/debian/local/rbqtapi.1 b/debian/_base/kdebindings/debian/local/rbqtapi.1
index e89b6f57d..e89b6f57d 100644
--- a/debian/squeeze/kdebindings/debian/local/rbqtapi.1
+++ b/debian/_base/kdebindings/debian/local/rbqtapi.1
diff --git a/debian/squeeze/kdebindings/debian/local/rbqtsh.1 b/debian/_base/kdebindings/debian/local/rbqtsh.1
index dfa020d3d..dfa020d3d 100644
--- a/debian/squeeze/kdebindings/debian/local/rbqtsh.1
+++ b/debian/_base/kdebindings/debian/local/rbqtsh.1
diff --git a/debian/squeeze/kdebindings/debian/local/rbuic.1 b/debian/_base/kdebindings/debian/local/rbuic.1
index 5191cd7b6..5191cd7b6 100644
--- a/debian/squeeze/kdebindings/debian/local/rbuic.1
+++ b/debian/_base/kdebindings/debian/local/rbuic.1
diff --git a/debian/squeeze/kdebindings/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdebindings/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdebindings/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdebindings/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdebindings/debian/patches/common/05_pedantic-errors.diff b/debian/_base/kdebindings/debian/patches/common/05_pedantic-errors.diff
index ce2883918..ce2883918 100644
--- a/debian/squeeze/kdebindings/debian/patches/common/05_pedantic-errors.diff
+++ b/debian/_base/kdebindings/debian/patches/common/05_pedantic-errors.diff
diff --git a/debian/squeeze/kdebindings/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdebindings/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdebindings/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdebindings/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdebindings/debian/patches/series b/debian/_base/kdebindings/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdebindings/debian/patches/series
+++ b/debian/_base/kdebindings/debian/patches/series
diff --git a/debian/squeeze/kdebindings/debian/python-dcop-trinity.docs b/debian/_base/kdebindings/debian/python-dcop-trinity.docs
index 957d3af3e..957d3af3e 100644
--- a/debian/squeeze/kdebindings/debian/python-dcop-trinity.docs
+++ b/debian/_base/kdebindings/debian/python-dcop-trinity.docs
diff --git a/debian/squeeze/kdebindings/debian/python-dcop-trinity.examples b/debian/_base/kdebindings/debian/python-dcop-trinity.examples
index 4100d465b..4100d465b 100644
--- a/debian/squeeze/kdebindings/debian/python-dcop-trinity.examples
+++ b/debian/_base/kdebindings/debian/python-dcop-trinity.examples
diff --git a/debian/squeeze/kdebindings/debian/python-dcop-trinity.install b/debian/_base/kdebindings/debian/python-dcop-trinity.install
index 364b52d9d..364b52d9d 100644
--- a/debian/squeeze/kdebindings/debian/python-dcop-trinity.install
+++ b/debian/_base/kdebindings/debian/python-dcop-trinity.install
diff --git a/debian/squeeze/kdebindings/debian/rules b/debian/_base/kdebindings/debian/rules
index 2a96323d3..2a96323d3 100755
--- a/debian/squeeze/kdebindings/debian/rules
+++ b/debian/_base/kdebindings/debian/rules
diff --git a/debian/squeeze/kdebindings/debian/source/format b/debian/_base/kdebindings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdebindings/debian/source/format
+++ b/debian/_base/kdebindings/debian/source/format
diff --git a/debian/squeeze/kdebindings/debian/source/options b/debian/_base/kdebindings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdebindings/debian/source/options
+++ b/debian/_base/kdebindings/debian/source/options
diff --git a/debian/squeeze/kdebindings/debian/tde-xparts-extras-trinity.install b/debian/_base/kdebindings/debian/tde-xparts-extras-trinity.install
index e29ab016c..e29ab016c 100644
--- a/debian/squeeze/kdebindings/debian/tde-xparts-extras-trinity.install
+++ b/debian/_base/kdebindings/debian/tde-xparts-extras-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 385c47c14..385c47c14 100644
--- a/debian/squeeze/kdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdeedu/debian/blinken-trinity.README.Debian b/debian/_base/kdeedu/debian/blinken-trinity.README.Debian
index 987b4e48b..987b4e48b 100644
--- a/debian/squeeze/kdeedu/debian/blinken-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/blinken-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/blinken-trinity.docs b/debian/_base/kdeedu/debian/blinken-trinity.docs
index e1c76b889..e1c76b889 100644
--- a/debian/squeeze/kdeedu/debian/blinken-trinity.docs
+++ b/debian/_base/kdeedu/debian/blinken-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/blinken-trinity.install b/debian/_base/kdeedu/debian/blinken-trinity.install
index b0a94f4f2..b0a94f4f2 100644
--- a/debian/squeeze/kdeedu/debian/blinken-trinity.install
+++ b/debian/_base/kdeedu/debian/blinken-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/blinken-trinity.manpages b/debian/_base/kdeedu/debian/blinken-trinity.manpages
index bbad38ebc..bbad38ebc 100644
--- a/debian/squeeze/kdeedu/debian/blinken-trinity.manpages
+++ b/debian/_base/kdeedu/debian/blinken-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/blinken-trinity.menu b/debian/_base/kdeedu/debian/blinken-trinity.menu
index 27d188afa..27d188afa 100644
--- a/debian/squeeze/kdeedu/debian/blinken-trinity.menu
+++ b/debian/_base/kdeedu/debian/blinken-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdeedu/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/debian/squeeze/kdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdeedu/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdeedu/debian/cdbs/kde.mk b/debian/_base/kdeedu/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdeedu/debian/cdbs/kde.mk
+++ b/debian/_base/kdeedu/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdeedu/debian/cdbs/versions.pl b/debian/_base/kdeedu/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdeedu/debian/cdbs/versions.pl
+++ b/debian/_base/kdeedu/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdeedu/debian/changelog b/debian/_base/kdeedu/debian/changelog
index a06503645..a06503645 100644
--- a/debian/squeeze/kdeedu/debian/changelog
+++ b/debian/_base/kdeedu/debian/changelog
diff --git a/debian/squeeze/kdeedu/debian/compat b/debian/_base/kdeedu/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdeedu/debian/compat
+++ b/debian/_base/kdeedu/debian/compat
diff --git a/debian/squeeze/kdeedu/debian/control b/debian/_base/kdeedu/debian/control
index 901ed86c9..901ed86c9 100644
--- a/debian/squeeze/kdeedu/debian/control
+++ b/debian/_base/kdeedu/debian/control
diff --git a/debian/squeeze/kdeedu/debian/copyright b/debian/_base/kdeedu/debian/copyright
index 272e4f376..272e4f376 100644
--- a/debian/squeeze/kdeedu/debian/copyright
+++ b/debian/_base/kdeedu/debian/copyright
diff --git a/debian/squeeze/kdeedu/debian/icons/blinken.xpm b/debian/_base/kdeedu/debian/icons/blinken.xpm
index 9aef8553a..9aef8553a 100644
--- a/debian/squeeze/kdeedu/debian/icons/blinken.xpm
+++ b/debian/_base/kdeedu/debian/icons/blinken.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kalzium.xpm b/debian/_base/kdeedu/debian/icons/kalzium.xpm
index 3f265dcc9..3f265dcc9 100644
--- a/debian/squeeze/kdeedu/debian/icons/kalzium.xpm
+++ b/debian/_base/kdeedu/debian/icons/kalzium.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kanagram.xpm b/debian/_base/kdeedu/debian/icons/kanagram.xpm
index d8fa0895d..d8fa0895d 100644
--- a/debian/squeeze/kdeedu/debian/icons/kanagram.xpm
+++ b/debian/_base/kdeedu/debian/icons/kanagram.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kbruch.xpm b/debian/_base/kdeedu/debian/icons/kbruch.xpm
index 9c4c6d33e..9c4c6d33e 100644
--- a/debian/squeeze/kdeedu/debian/icons/kbruch.xpm
+++ b/debian/_base/kdeedu/debian/icons/kbruch.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/keduca.xpm b/debian/_base/kdeedu/debian/icons/keduca.xpm
index e4ddce938..e4ddce938 100644
--- a/debian/squeeze/kdeedu/debian/icons/keduca.xpm
+++ b/debian/_base/kdeedu/debian/icons/keduca.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kgeography.xpm b/debian/_base/kdeedu/debian/icons/kgeography.xpm
index 34e91c81f..34e91c81f 100644
--- a/debian/squeeze/kdeedu/debian/icons/kgeography.xpm
+++ b/debian/_base/kdeedu/debian/icons/kgeography.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/khangman.xpm b/debian/_base/kdeedu/debian/icons/khangman.xpm
index 18251829d..18251829d 100644
--- a/debian/squeeze/kdeedu/debian/icons/khangman.xpm
+++ b/debian/_base/kdeedu/debian/icons/khangman.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kig.xpm b/debian/_base/kdeedu/debian/icons/kig.xpm
index e518e618a..e518e618a 100644
--- a/debian/squeeze/kdeedu/debian/icons/kig.xpm
+++ b/debian/_base/kdeedu/debian/icons/kig.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kiten.xpm b/debian/_base/kdeedu/debian/icons/kiten.xpm
index 92101a430..92101a430 100644
--- a/debian/squeeze/kdeedu/debian/icons/kiten.xpm
+++ b/debian/_base/kdeedu/debian/icons/kiten.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/klatin.xpm b/debian/_base/kdeedu/debian/icons/klatin.xpm
index 1e8cccf38..1e8cccf38 100644
--- a/debian/squeeze/kdeedu/debian/icons/klatin.xpm
+++ b/debian/_base/kdeedu/debian/icons/klatin.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/klettres.xpm b/debian/_base/kdeedu/debian/icons/klettres.xpm
index be4851eee..be4851eee 100644
--- a/debian/squeeze/kdeedu/debian/icons/klettres.xpm
+++ b/debian/_base/kdeedu/debian/icons/klettres.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kmplot.xpm b/debian/_base/kdeedu/debian/icons/kmplot.xpm
index a37fbc778..a37fbc778 100644
--- a/debian/squeeze/kdeedu/debian/icons/kmplot.xpm
+++ b/debian/_base/kdeedu/debian/icons/kmplot.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kpercentage.xpm b/debian/_base/kdeedu/debian/icons/kpercentage.xpm
index 4f4b77fd2..4f4b77fd2 100644
--- a/debian/squeeze/kdeedu/debian/icons/kpercentage.xpm
+++ b/debian/_base/kdeedu/debian/icons/kpercentage.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kstars.xpm b/debian/_base/kdeedu/debian/icons/kstars.xpm
index d7c0c52db..d7c0c52db 100644
--- a/debian/squeeze/kdeedu/debian/icons/kstars.xpm
+++ b/debian/_base/kdeedu/debian/icons/kstars.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/ktouch.xpm b/debian/_base/kdeedu/debian/icons/ktouch.xpm
index 93378760a..93378760a 100644
--- a/debian/squeeze/kdeedu/debian/icons/ktouch.xpm
+++ b/debian/_base/kdeedu/debian/icons/ktouch.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kturtle.xpm b/debian/_base/kdeedu/debian/icons/kturtle.xpm
index ebde8cd2d..ebde8cd2d 100644
--- a/debian/squeeze/kdeedu/debian/icons/kturtle.xpm
+++ b/debian/_base/kdeedu/debian/icons/kturtle.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kverbos.xpm b/debian/_base/kdeedu/debian/icons/kverbos.xpm
index 2a3e33969..2a3e33969 100644
--- a/debian/squeeze/kdeedu/debian/icons/kverbos.xpm
+++ b/debian/_base/kdeedu/debian/icons/kverbos.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kvoctrain.xpm b/debian/_base/kdeedu/debian/icons/kvoctrain.xpm
index bb2421754..bb2421754 100644
--- a/debian/squeeze/kdeedu/debian/icons/kvoctrain.xpm
+++ b/debian/_base/kdeedu/debian/icons/kvoctrain.xpm
diff --git a/debian/squeeze/kdeedu/debian/icons/kwordquiz.xpm b/debian/_base/kdeedu/debian/icons/kwordquiz.xpm
index 7d855ed5e..7d855ed5e 100644
--- a/debian/squeeze/kdeedu/debian/icons/kwordquiz.xpm
+++ b/debian/_base/kdeedu/debian/icons/kwordquiz.xpm
diff --git a/debian/squeeze/kdeedu/debian/indi-trinity.docs b/debian/_base/kdeedu/debian/indi-trinity.docs
index 4972ae664..4972ae664 100644
--- a/debian/squeeze/kdeedu/debian/indi-trinity.docs
+++ b/debian/_base/kdeedu/debian/indi-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/indi-trinity.install b/debian/_base/kdeedu/debian/indi-trinity.install
index 82db36a4a..82db36a4a 100644
--- a/debian/squeeze/kdeedu/debian/indi-trinity.install
+++ b/debian/_base/kdeedu/debian/indi-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/indi-trinity.install.kfreebsd-i386 b/debian/_base/kdeedu/debian/indi-trinity.install.kfreebsd-i386
index 40860ff1a..40860ff1a 100644
--- a/debian/squeeze/kdeedu/debian/indi-trinity.install.kfreebsd-i386
+++ b/debian/_base/kdeedu/debian/indi-trinity.install.kfreebsd-i386
diff --git a/debian/squeeze/kdeedu/debian/indi-trinity.manpages b/debian/_base/kdeedu/debian/indi-trinity.manpages
index 1c974f253..1c974f253 100644
--- a/debian/squeeze/kdeedu/debian/indi-trinity.manpages
+++ b/debian/_base/kdeedu/debian/indi-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kalzium-data-trinity.install b/debian/_base/kdeedu/debian/kalzium-data-trinity.install
index 05ae14025..05ae14025 100644
--- a/debian/squeeze/kdeedu/debian/kalzium-data-trinity.install
+++ b/debian/_base/kdeedu/debian/kalzium-data-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kalzium-trinity.README.Debian b/debian/_base/kdeedu/debian/kalzium-trinity.README.Debian
index ab3aedfb9..ab3aedfb9 100644
--- a/debian/squeeze/kdeedu/debian/kalzium-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kalzium-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kalzium-trinity.docs b/debian/_base/kdeedu/debian/kalzium-trinity.docs
index a7127e507..a7127e507 100644
--- a/debian/squeeze/kdeedu/debian/kalzium-trinity.docs
+++ b/debian/_base/kdeedu/debian/kalzium-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kalzium-trinity.install b/debian/_base/kdeedu/debian/kalzium-trinity.install
index 9b9bca470..9b9bca470 100644
--- a/debian/squeeze/kdeedu/debian/kalzium-trinity.install
+++ b/debian/_base/kdeedu/debian/kalzium-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kalzium-trinity.manpages b/debian/_base/kdeedu/debian/kalzium-trinity.manpages
index 2ac62d8e2..2ac62d8e2 100644
--- a/debian/squeeze/kdeedu/debian/kalzium-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kalzium-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kalzium-trinity.menu b/debian/_base/kdeedu/debian/kalzium-trinity.menu
index 8150473ae..8150473ae 100644
--- a/debian/squeeze/kdeedu/debian/kalzium-trinity.menu
+++ b/debian/_base/kdeedu/debian/kalzium-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kanagram-trinity.README.Debian b/debian/_base/kdeedu/debian/kanagram-trinity.README.Debian
index 5c94d6832..5c94d6832 100644
--- a/debian/squeeze/kdeedu/debian/kanagram-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kanagram-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kanagram-trinity.docs b/debian/_base/kdeedu/debian/kanagram-trinity.docs
index 99ffc3dc2..99ffc3dc2 100644
--- a/debian/squeeze/kdeedu/debian/kanagram-trinity.docs
+++ b/debian/_base/kdeedu/debian/kanagram-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kanagram-trinity.install b/debian/_base/kdeedu/debian/kanagram-trinity.install
index 4793db665..4793db665 100644
--- a/debian/squeeze/kdeedu/debian/kanagram-trinity.install
+++ b/debian/_base/kdeedu/debian/kanagram-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kanagram-trinity.manpages b/debian/_base/kdeedu/debian/kanagram-trinity.manpages
index bf36c99a5..bf36c99a5 100644
--- a/debian/squeeze/kdeedu/debian/kanagram-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kanagram-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kanagram-trinity.menu b/debian/_base/kdeedu/debian/kanagram-trinity.menu
index 2ae493c03..2ae493c03 100644
--- a/debian/squeeze/kdeedu/debian/kanagram-trinity.menu
+++ b/debian/_base/kdeedu/debian/kanagram-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kbruch-trinity.README.Debian b/debian/_base/kdeedu/debian/kbruch-trinity.README.Debian
index 3c67ecb17..3c67ecb17 100644
--- a/debian/squeeze/kdeedu/debian/kbruch-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kbruch-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kbruch-trinity.docs b/debian/_base/kdeedu/debian/kbruch-trinity.docs
index 9affc1576..9affc1576 100644
--- a/debian/squeeze/kdeedu/debian/kbruch-trinity.docs
+++ b/debian/_base/kdeedu/debian/kbruch-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kbruch-trinity.install b/debian/_base/kdeedu/debian/kbruch-trinity.install
index e32bda253..e32bda253 100644
--- a/debian/squeeze/kdeedu/debian/kbruch-trinity.install
+++ b/debian/_base/kdeedu/debian/kbruch-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kbruch-trinity.manpages b/debian/_base/kdeedu/debian/kbruch-trinity.manpages
index 622f534e2..622f534e2 100644
--- a/debian/squeeze/kdeedu/debian/kbruch-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kbruch-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kbruch-trinity.menu b/debian/_base/kdeedu/debian/kbruch-trinity.menu
index 895407a25..895407a25 100644
--- a/debian/squeeze/kdeedu/debian/kbruch-trinity.menu
+++ b/debian/_base/kdeedu/debian/kbruch-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-data-trinity.install b/debian/_base/kdeedu/debian/kdeedu-data-trinity.install
index 021e2b38d..021e2b38d 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-data-trinity.install
+++ b/debian/_base/kdeedu/debian/kdeedu-data-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.blinken b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.blinken
index 0981d3897..0981d3897 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.blinken
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.blinken
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium
index 41475e0ee..41475e0ee 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch
index 117156815..117156815 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.keduca b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.keduca
index 810f29b8c..810f29b8c 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.keduca
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.keduca
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kgeography b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kgeography
index 0f3d386af..0f3d386af 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kgeography
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kgeography
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.khangman b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.khangman
index c6b25da48..c6b25da48 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.khangman
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.khangman
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kig b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kig
index e8569fb22..e8569fb22 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kig
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kig
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kiten b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kiten
index a8b4130a6..a8b4130a6 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kiten
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kiten
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.klatin b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.klatin
index a5f795b93..a5f795b93 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.klatin
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.klatin
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.klettres b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.klettres
index 9c3595aad..9c3595aad 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.klettres
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.klettres
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot
index 6a2342dab..6a2342dab 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage
index 2c172778c..2c172778c 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kstars b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kstars
index 33b5ec707..33b5ec707 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kstars
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kstars
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch
index a7815e054..a7815e054 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle
index 3104fe43e..3104fe43e 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos
index 6a1dd3d86..6a1dd3d86 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain
index a789694b6..a789694b6 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
index 1635db7e2..1635db7e2 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
+++ b/debian/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
diff --git a/debian/squeeze/kdeedu/debian/kdeedu-trinity.README.Debian b/debian/_base/kdeedu/debian/kdeedu-trinity.README.Debian
index f608d0cfb..f608d0cfb 100644
--- a/debian/squeeze/kdeedu/debian/kdeedu-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kdeedu-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/keduca-shrinker b/debian/_base/kdeedu/debian/keduca-shrinker
index 188b3e0ef..188b3e0ef 100644
--- a/debian/squeeze/kdeedu/debian/keduca-shrinker
+++ b/debian/_base/kdeedu/debian/keduca-shrinker
diff --git a/debian/squeeze/kdeedu/debian/keduca-trinity.README.Debian b/debian/_base/kdeedu/debian/keduca-trinity.README.Debian
index 042f785f1..042f785f1 100644
--- a/debian/squeeze/kdeedu/debian/keduca-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/keduca-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/keduca-trinity.docs b/debian/_base/kdeedu/debian/keduca-trinity.docs
index 8999d5487..8999d5487 100644
--- a/debian/squeeze/kdeedu/debian/keduca-trinity.docs
+++ b/debian/_base/kdeedu/debian/keduca-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/keduca-trinity.install b/debian/_base/kdeedu/debian/keduca-trinity.install
index 10264f55f..10264f55f 100644
--- a/debian/squeeze/kdeedu/debian/keduca-trinity.install
+++ b/debian/_base/kdeedu/debian/keduca-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/keduca-trinity.manpages b/debian/_base/kdeedu/debian/keduca-trinity.manpages
index 99bab9f63..99bab9f63 100644
--- a/debian/squeeze/kdeedu/debian/keduca-trinity.manpages
+++ b/debian/_base/kdeedu/debian/keduca-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/keduca-trinity.menu b/debian/_base/kdeedu/debian/keduca-trinity.menu
index 58650bb79..58650bb79 100644
--- a/debian/squeeze/kdeedu/debian/keduca-trinity.menu
+++ b/debian/_base/kdeedu/debian/keduca-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kgeography-data-trinity.install b/debian/_base/kdeedu/debian/kgeography-data-trinity.install
index 9fbb1a151..9fbb1a151 100644
--- a/debian/squeeze/kdeedu/debian/kgeography-data-trinity.install
+++ b/debian/_base/kdeedu/debian/kgeography-data-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kgeography-trinity.README.Debian b/debian/_base/kdeedu/debian/kgeography-trinity.README.Debian
index 90b3dd1a4..90b3dd1a4 100644
--- a/debian/squeeze/kdeedu/debian/kgeography-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kgeography-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kgeography-trinity.docs b/debian/_base/kdeedu/debian/kgeography-trinity.docs
index 1e7ef4e27..1e7ef4e27 100644
--- a/debian/squeeze/kdeedu/debian/kgeography-trinity.docs
+++ b/debian/_base/kdeedu/debian/kgeography-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kgeography-trinity.install b/debian/_base/kdeedu/debian/kgeography-trinity.install
index 01bde9d25..01bde9d25 100644
--- a/debian/squeeze/kdeedu/debian/kgeography-trinity.install
+++ b/debian/_base/kdeedu/debian/kgeography-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kgeography-trinity.manpages b/debian/_base/kdeedu/debian/kgeography-trinity.manpages
index 390e2bed2..390e2bed2 100644
--- a/debian/squeeze/kdeedu/debian/kgeography-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kgeography-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kgeography-trinity.menu b/debian/_base/kdeedu/debian/kgeography-trinity.menu
index 0bf2a46b0..0bf2a46b0 100644
--- a/debian/squeeze/kdeedu/debian/kgeography-trinity.menu
+++ b/debian/_base/kdeedu/debian/kgeography-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/khangman-trinity.README.Debian b/debian/_base/kdeedu/debian/khangman-trinity.README.Debian
index 3f9ecc785..3f9ecc785 100644
--- a/debian/squeeze/kdeedu/debian/khangman-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/khangman-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/khangman-trinity.docs b/debian/_base/kdeedu/debian/khangman-trinity.docs
index 9b12a19b3..9b12a19b3 100644
--- a/debian/squeeze/kdeedu/debian/khangman-trinity.docs
+++ b/debian/_base/kdeedu/debian/khangman-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/khangman-trinity.install b/debian/_base/kdeedu/debian/khangman-trinity.install
index 2047c5ecb..2047c5ecb 100644
--- a/debian/squeeze/kdeedu/debian/khangman-trinity.install
+++ b/debian/_base/kdeedu/debian/khangman-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/khangman-trinity.manpages b/debian/_base/kdeedu/debian/khangman-trinity.manpages
index b49d3e8fd..b49d3e8fd 100644
--- a/debian/squeeze/kdeedu/debian/khangman-trinity.manpages
+++ b/debian/_base/kdeedu/debian/khangman-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/khangman-trinity.menu b/debian/_base/kdeedu/debian/khangman-trinity.menu
index 14019cf51..14019cf51 100644
--- a/debian/squeeze/kdeedu/debian/khangman-trinity.menu
+++ b/debian/_base/kdeedu/debian/khangman-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kig-trinity.README.Debian b/debian/_base/kdeedu/debian/kig-trinity.README.Debian
index 567300de0..567300de0 100644
--- a/debian/squeeze/kdeedu/debian/kig-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kig-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kig-trinity.docs b/debian/_base/kdeedu/debian/kig-trinity.docs
index 0226b94bb..0226b94bb 100644
--- a/debian/squeeze/kdeedu/debian/kig-trinity.docs
+++ b/debian/_base/kdeedu/debian/kig-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kig-trinity.install b/debian/_base/kdeedu/debian/kig-trinity.install
index 55a817ea8..55a817ea8 100644
--- a/debian/squeeze/kdeedu/debian/kig-trinity.install
+++ b/debian/_base/kdeedu/debian/kig-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kig-trinity.manpages b/debian/_base/kdeedu/debian/kig-trinity.manpages
index 9d8d993a9..9d8d993a9 100644
--- a/debian/squeeze/kdeedu/debian/kig-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kig-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kig-trinity.menu b/debian/_base/kdeedu/debian/kig-trinity.menu
index ae6ef3bb7..ae6ef3bb7 100644
--- a/debian/squeeze/kdeedu/debian/kig-trinity.menu
+++ b/debian/_base/kdeedu/debian/kig-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kiten-trinity.README.Debian b/debian/_base/kdeedu/debian/kiten-trinity.README.Debian
index e860870ca..e860870ca 100644
--- a/debian/squeeze/kdeedu/debian/kiten-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kiten-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kiten-trinity.docs b/debian/_base/kdeedu/debian/kiten-trinity.docs
index 92cb85823..92cb85823 100644
--- a/debian/squeeze/kdeedu/debian/kiten-trinity.docs
+++ b/debian/_base/kdeedu/debian/kiten-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kiten-trinity.install b/debian/_base/kdeedu/debian/kiten-trinity.install
index 652f08bde..652f08bde 100644
--- a/debian/squeeze/kdeedu/debian/kiten-trinity.install
+++ b/debian/_base/kdeedu/debian/kiten-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kiten-trinity.manpages b/debian/_base/kdeedu/debian/kiten-trinity.manpages
index 1fd7ca049..1fd7ca049 100644
--- a/debian/squeeze/kdeedu/debian/kiten-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kiten-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kiten-trinity.menu b/debian/_base/kdeedu/debian/kiten-trinity.menu
index 6acb9a175..6acb9a175 100644
--- a/debian/squeeze/kdeedu/debian/kiten-trinity.menu
+++ b/debian/_base/kdeedu/debian/kiten-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/klatin-trinity.README.Debian b/debian/_base/kdeedu/debian/klatin-trinity.README.Debian
index 30c214675..30c214675 100644
--- a/debian/squeeze/kdeedu/debian/klatin-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/klatin-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/klatin-trinity.docs b/debian/_base/kdeedu/debian/klatin-trinity.docs
index df25d33f1..df25d33f1 100644
--- a/debian/squeeze/kdeedu/debian/klatin-trinity.docs
+++ b/debian/_base/kdeedu/debian/klatin-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/klatin-trinity.install b/debian/_base/kdeedu/debian/klatin-trinity.install
index 239a231f0..239a231f0 100644
--- a/debian/squeeze/kdeedu/debian/klatin-trinity.install
+++ b/debian/_base/kdeedu/debian/klatin-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/klatin-trinity.manpages b/debian/_base/kdeedu/debian/klatin-trinity.manpages
index 72c7f2719..72c7f2719 100644
--- a/debian/squeeze/kdeedu/debian/klatin-trinity.manpages
+++ b/debian/_base/kdeedu/debian/klatin-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/klatin-trinity.menu b/debian/_base/kdeedu/debian/klatin-trinity.menu
index d25c39903..d25c39903 100644
--- a/debian/squeeze/kdeedu/debian/klatin-trinity.menu
+++ b/debian/_base/kdeedu/debian/klatin-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/klettres-data-trinity.README.Debian b/debian/_base/kdeedu/debian/klettres-data-trinity.README.Debian
index 6e0ac76cc..6e0ac76cc 100644
--- a/debian/squeeze/kdeedu/debian/klettres-data-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/klettres-data-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/klettres-data-trinity.docs b/debian/_base/kdeedu/debian/klettres-data-trinity.docs
index 3f3b2d265..3f3b2d265 100644
--- a/debian/squeeze/kdeedu/debian/klettres-data-trinity.docs
+++ b/debian/_base/kdeedu/debian/klettres-data-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/klettres-data-trinity.install b/debian/_base/kdeedu/debian/klettres-data-trinity.install
index fa8533f0e..fa8533f0e 100644
--- a/debian/squeeze/kdeedu/debian/klettres-data-trinity.install
+++ b/debian/_base/kdeedu/debian/klettres-data-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/klettres-trinity.README.Debian b/debian/_base/kdeedu/debian/klettres-trinity.README.Debian
index 2b3b8944e..2b3b8944e 100644
--- a/debian/squeeze/kdeedu/debian/klettres-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/klettres-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/klettres-trinity.docs b/debian/_base/kdeedu/debian/klettres-trinity.docs
index 3f3b2d265..3f3b2d265 100644
--- a/debian/squeeze/kdeedu/debian/klettres-trinity.docs
+++ b/debian/_base/kdeedu/debian/klettres-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/klettres-trinity.install b/debian/_base/kdeedu/debian/klettres-trinity.install
index 793cc5d84..793cc5d84 100644
--- a/debian/squeeze/kdeedu/debian/klettres-trinity.install
+++ b/debian/_base/kdeedu/debian/klettres-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/klettres-trinity.manpages b/debian/_base/kdeedu/debian/klettres-trinity.manpages
index 769e1a35e..769e1a35e 100644
--- a/debian/squeeze/kdeedu/debian/klettres-trinity.manpages
+++ b/debian/_base/kdeedu/debian/klettres-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/klettres-trinity.menu b/debian/_base/kdeedu/debian/klettres-trinity.menu
index 7fc2ff5d1..7fc2ff5d1 100644
--- a/debian/squeeze/kdeedu/debian/klettres-trinity.menu
+++ b/debian/_base/kdeedu/debian/klettres-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kmplot-trinity.README.Debian b/debian/_base/kdeedu/debian/kmplot-trinity.README.Debian
index f1e947ca3..f1e947ca3 100644
--- a/debian/squeeze/kdeedu/debian/kmplot-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kmplot-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kmplot-trinity.docs b/debian/_base/kdeedu/debian/kmplot-trinity.docs
index 3c0de4f5d..3c0de4f5d 100644
--- a/debian/squeeze/kdeedu/debian/kmplot-trinity.docs
+++ b/debian/_base/kdeedu/debian/kmplot-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kmplot-trinity.install b/debian/_base/kdeedu/debian/kmplot-trinity.install
index c75adb783..c75adb783 100644
--- a/debian/squeeze/kdeedu/debian/kmplot-trinity.install
+++ b/debian/_base/kdeedu/debian/kmplot-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kmplot-trinity.manpages b/debian/_base/kdeedu/debian/kmplot-trinity.manpages
index 347f3c24b..347f3c24b 100644
--- a/debian/squeeze/kdeedu/debian/kmplot-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kmplot-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kmplot-trinity.menu b/debian/_base/kdeedu/debian/kmplot-trinity.menu
index 6315ba999..6315ba999 100644
--- a/debian/squeeze/kdeedu/debian/kmplot-trinity.menu
+++ b/debian/_base/kdeedu/debian/kmplot-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kpercentage-trinity.README.Debian b/debian/_base/kdeedu/debian/kpercentage-trinity.README.Debian
index 2864356e4..2864356e4 100644
--- a/debian/squeeze/kdeedu/debian/kpercentage-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kpercentage-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kpercentage-trinity.docs b/debian/_base/kdeedu/debian/kpercentage-trinity.docs
index 4c4a6a22e..4c4a6a22e 100644
--- a/debian/squeeze/kdeedu/debian/kpercentage-trinity.docs
+++ b/debian/_base/kdeedu/debian/kpercentage-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kpercentage-trinity.install b/debian/_base/kdeedu/debian/kpercentage-trinity.install
index 592f5475b..592f5475b 100644
--- a/debian/squeeze/kdeedu/debian/kpercentage-trinity.install
+++ b/debian/_base/kdeedu/debian/kpercentage-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kpercentage-trinity.manpages b/debian/_base/kdeedu/debian/kpercentage-trinity.manpages
index a08d7f942..a08d7f942 100644
--- a/debian/squeeze/kdeedu/debian/kpercentage-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kpercentage-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kpercentage-trinity.menu b/debian/_base/kdeedu/debian/kpercentage-trinity.menu
index 8196c2b98..8196c2b98 100644
--- a/debian/squeeze/kdeedu/debian/kpercentage-trinity.menu
+++ b/debian/_base/kdeedu/debian/kpercentage-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kstars-data-trinity.README.Debian b/debian/_base/kdeedu/debian/kstars-data-trinity.README.Debian
index 7032707b2..7032707b2 100644
--- a/debian/squeeze/kdeedu/debian/kstars-data-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kstars-data-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kstars-data-trinity.docs b/debian/_base/kdeedu/debian/kstars-data-trinity.docs
index 498ca09be..498ca09be 100644
--- a/debian/squeeze/kdeedu/debian/kstars-data-trinity.docs
+++ b/debian/_base/kdeedu/debian/kstars-data-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kstars-data-trinity.install b/debian/_base/kdeedu/debian/kstars-data-trinity.install
index 5ccd88f52..5ccd88f52 100644
--- a/debian/squeeze/kdeedu/debian/kstars-data-trinity.install
+++ b/debian/_base/kdeedu/debian/kstars-data-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kstars-trinity.README.Debian b/debian/_base/kdeedu/debian/kstars-trinity.README.Debian
index f709389fa..f709389fa 100644
--- a/debian/squeeze/kdeedu/debian/kstars-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kstars-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kstars-trinity.docs b/debian/_base/kdeedu/debian/kstars-trinity.docs
index 498ca09be..498ca09be 100644
--- a/debian/squeeze/kdeedu/debian/kstars-trinity.docs
+++ b/debian/_base/kdeedu/debian/kstars-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kstars-trinity.install b/debian/_base/kdeedu/debian/kstars-trinity.install
index 31da35a55..31da35a55 100644
--- a/debian/squeeze/kdeedu/debian/kstars-trinity.install
+++ b/debian/_base/kdeedu/debian/kstars-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kstars-trinity.manpages b/debian/_base/kdeedu/debian/kstars-trinity.manpages
index e780d23cc..e780d23cc 100644
--- a/debian/squeeze/kdeedu/debian/kstars-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kstars-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kstars-trinity.menu b/debian/_base/kdeedu/debian/kstars-trinity.menu
index 6afa4e411..6afa4e411 100644
--- a/debian/squeeze/kdeedu/debian/kstars-trinity.menu
+++ b/debian/_base/kdeedu/debian/kstars-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/ktouch-trinity.README.Debian b/debian/_base/kdeedu/debian/ktouch-trinity.README.Debian
index 7f42f52c0..7f42f52c0 100644
--- a/debian/squeeze/kdeedu/debian/ktouch-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/ktouch-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/ktouch-trinity.docs b/debian/_base/kdeedu/debian/ktouch-trinity.docs
index b24780ab4..b24780ab4 100644
--- a/debian/squeeze/kdeedu/debian/ktouch-trinity.docs
+++ b/debian/_base/kdeedu/debian/ktouch-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/ktouch-trinity.install b/debian/_base/kdeedu/debian/ktouch-trinity.install
index da2308667..da2308667 100644
--- a/debian/squeeze/kdeedu/debian/ktouch-trinity.install
+++ b/debian/_base/kdeedu/debian/ktouch-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/ktouch-trinity.manpages b/debian/_base/kdeedu/debian/ktouch-trinity.manpages
index 3c91278db..3c91278db 100644
--- a/debian/squeeze/kdeedu/debian/ktouch-trinity.manpages
+++ b/debian/_base/kdeedu/debian/ktouch-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/ktouch-trinity.menu b/debian/_base/kdeedu/debian/ktouch-trinity.menu
index dc1037238..dc1037238 100644
--- a/debian/squeeze/kdeedu/debian/ktouch-trinity.menu
+++ b/debian/_base/kdeedu/debian/ktouch-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kturtle-trinity.README.Debian b/debian/_base/kdeedu/debian/kturtle-trinity.README.Debian
index 122150a00..122150a00 100644
--- a/debian/squeeze/kdeedu/debian/kturtle-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kturtle-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kturtle-trinity.docs b/debian/_base/kdeedu/debian/kturtle-trinity.docs
index ef5b58bc9..ef5b58bc9 100644
--- a/debian/squeeze/kdeedu/debian/kturtle-trinity.docs
+++ b/debian/_base/kdeedu/debian/kturtle-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kturtle-trinity.install b/debian/_base/kdeedu/debian/kturtle-trinity.install
index f5f42ad75..f5f42ad75 100644
--- a/debian/squeeze/kdeedu/debian/kturtle-trinity.install
+++ b/debian/_base/kdeedu/debian/kturtle-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kturtle-trinity.manpages b/debian/_base/kdeedu/debian/kturtle-trinity.manpages
index f0a3e17d8..f0a3e17d8 100644
--- a/debian/squeeze/kdeedu/debian/kturtle-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kturtle-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kturtle-trinity.menu b/debian/_base/kdeedu/debian/kturtle-trinity.menu
index b1de72c0e..b1de72c0e 100644
--- a/debian/squeeze/kdeedu/debian/kturtle-trinity.menu
+++ b/debian/_base/kdeedu/debian/kturtle-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kverbos-trinity.README.Debian b/debian/_base/kdeedu/debian/kverbos-trinity.README.Debian
index a2a469e40..a2a469e40 100644
--- a/debian/squeeze/kdeedu/debian/kverbos-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kverbos-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kverbos-trinity.docs b/debian/_base/kdeedu/debian/kverbos-trinity.docs
index 950e6d59f..950e6d59f 100644
--- a/debian/squeeze/kdeedu/debian/kverbos-trinity.docs
+++ b/debian/_base/kdeedu/debian/kverbos-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kverbos-trinity.install b/debian/_base/kdeedu/debian/kverbos-trinity.install
index 7ce86854f..7ce86854f 100644
--- a/debian/squeeze/kdeedu/debian/kverbos-trinity.install
+++ b/debian/_base/kdeedu/debian/kverbos-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kverbos-trinity.manpages b/debian/_base/kdeedu/debian/kverbos-trinity.manpages
index d47a4e1b1..d47a4e1b1 100644
--- a/debian/squeeze/kdeedu/debian/kverbos-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kverbos-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kverbos-trinity.menu b/debian/_base/kdeedu/debian/kverbos-trinity.menu
index f6aece42e..f6aece42e 100644
--- a/debian/squeeze/kdeedu/debian/kverbos-trinity.menu
+++ b/debian/_base/kdeedu/debian/kverbos-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.README.Debian b/debian/_base/kdeedu/debian/kvoctrain-trinity.README.Debian
index 6dcfee0ed..6dcfee0ed 100644
--- a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kvoctrain-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.docs b/debian/_base/kdeedu/debian/kvoctrain-trinity.docs
index a6f1a9161..a6f1a9161 100644
--- a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.docs
+++ b/debian/_base/kdeedu/debian/kvoctrain-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.install b/debian/_base/kdeedu/debian/kvoctrain-trinity.install
index 07d71a27f..07d71a27f 100644
--- a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.install
+++ b/debian/_base/kdeedu/debian/kvoctrain-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.manpages b/debian/_base/kdeedu/debian/kvoctrain-trinity.manpages
index c02c3041f..c02c3041f 100644
--- a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kvoctrain-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.menu b/debian/_base/kdeedu/debian/kvoctrain-trinity.menu
index 65716e3c1..65716e3c1 100644
--- a/debian/squeeze/kdeedu/debian/kvoctrain-trinity.menu
+++ b/debian/_base/kdeedu/debian/kvoctrain-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.README.Debian b/debian/_base/kdeedu/debian/kwordquiz-trinity.README.Debian
index cf3009383..cf3009383 100644
--- a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.README.Debian
+++ b/debian/_base/kdeedu/debian/kwordquiz-trinity.README.Debian
diff --git a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.docs b/debian/_base/kdeedu/debian/kwordquiz-trinity.docs
index cb0875fed..cb0875fed 100644
--- a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.docs
+++ b/debian/_base/kdeedu/debian/kwordquiz-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.install b/debian/_base/kdeedu/debian/kwordquiz-trinity.install
index 6490edf60..6490edf60 100644
--- a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.install
+++ b/debian/_base/kdeedu/debian/kwordquiz-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.manpages b/debian/_base/kdeedu/debian/kwordquiz-trinity.manpages
index 1f4715f49..1f4715f49 100644
--- a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.manpages
+++ b/debian/_base/kdeedu/debian/kwordquiz-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.menu b/debian/_base/kdeedu/debian/kwordquiz-trinity.menu
index bb408e28c..bb408e28c 100644
--- a/debian/squeeze/kdeedu/debian/kwordquiz-trinity.menu
+++ b/debian/_base/kdeedu/debian/kwordquiz-trinity.menu
diff --git a/debian/squeeze/kdeedu/debian/libkdeedu-dev-trinity.docs b/debian/_base/kdeedu/debian/libkdeedu-dev-trinity.docs
index 16da301c1..16da301c1 100644
--- a/debian/squeeze/kdeedu/debian/libkdeedu-dev-trinity.docs
+++ b/debian/_base/kdeedu/debian/libkdeedu-dev-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/libkdeedu-dev-trinity.install b/debian/_base/kdeedu/debian/libkdeedu-dev-trinity.install
index 50fcf50ea..50fcf50ea 100644
--- a/debian/squeeze/kdeedu/debian/libkdeedu-dev-trinity.install
+++ b/debian/_base/kdeedu/debian/libkdeedu-dev-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/libkdeedu-dev-trinity.manpages b/debian/_base/kdeedu/debian/libkdeedu-dev-trinity.manpages
index b1292516f..b1292516f 100644
--- a/debian/squeeze/kdeedu/debian/libkdeedu-dev-trinity.manpages
+++ b/debian/_base/kdeedu/debian/libkdeedu-dev-trinity.manpages
diff --git a/debian/squeeze/kdeedu/debian/libkdeedu3-trinity.docs b/debian/_base/kdeedu/debian/libkdeedu3-trinity.docs
index 16da301c1..16da301c1 100644
--- a/debian/squeeze/kdeedu/debian/libkdeedu3-trinity.docs
+++ b/debian/_base/kdeedu/debian/libkdeedu3-trinity.docs
diff --git a/debian/squeeze/kdeedu/debian/libkdeedu3-trinity.install b/debian/_base/kdeedu/debian/libkdeedu3-trinity.install
index 13f432e0e..13f432e0e 100644
--- a/debian/squeeze/kdeedu/debian/libkdeedu3-trinity.install
+++ b/debian/_base/kdeedu/debian/libkdeedu3-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/libkdeedu3-trinity.override b/debian/_base/kdeedu/debian/libkdeedu3-trinity.override
index 348d4ae74..348d4ae74 100644
--- a/debian/squeeze/kdeedu/debian/libkdeedu3-trinity.override
+++ b/debian/_base/kdeedu/debian/libkdeedu3-trinity.override
diff --git a/debian/squeeze/kdeedu/debian/libkiten-dev-trinity.install b/debian/_base/kdeedu/debian/libkiten-dev-trinity.install
index ca0848fd9..ca0848fd9 100644
--- a/debian/squeeze/kdeedu/debian/libkiten-dev-trinity.install
+++ b/debian/_base/kdeedu/debian/libkiten-dev-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/libkiten1-trinity.install b/debian/_base/kdeedu/debian/libkiten1-trinity.install
index 1d3ae5e00..1d3ae5e00 100644
--- a/debian/squeeze/kdeedu/debian/libkiten1-trinity.install
+++ b/debian/_base/kdeedu/debian/libkiten1-trinity.install
diff --git a/debian/squeeze/kdeedu/debian/libkiten1-trinity.links b/debian/_base/kdeedu/debian/libkiten1-trinity.links
index 0663edfd3..0663edfd3 100644
--- a/debian/squeeze/kdeedu/debian/libkiten1-trinity.links
+++ b/debian/_base/kdeedu/debian/libkiten1-trinity.links
diff --git a/debian/squeeze/kdeedu/debian/man/blinken-trinity.1 b/debian/_base/kdeedu/debian/man/blinken-trinity.1
index 97e123744..97e123744 100644
--- a/debian/squeeze/kdeedu/debian/man/blinken-trinity.1
+++ b/debian/_base/kdeedu/debian/man/blinken-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/celestrongps-trinity.1 b/debian/_base/kdeedu/debian/man/celestrongps-trinity.1
index 2e675ff5d..2e675ff5d 100644
--- a/debian/squeeze/kdeedu/debian/man/celestrongps-trinity.1
+++ b/debian/_base/kdeedu/debian/man/celestrongps-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/fliccd-trinity.1 b/debian/_base/kdeedu/debian/man/fliccd-trinity.1
index 732597f01..732597f01 100644
--- a/debian/squeeze/kdeedu/debian/man/fliccd-trinity.1
+++ b/debian/_base/kdeedu/debian/man/fliccd-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/indiserver-trinity.1 b/debian/_base/kdeedu/debian/man/indiserver-trinity.1
index da656ccdb..da656ccdb 100644
--- a/debian/squeeze/kdeedu/debian/man/indiserver-trinity.1
+++ b/debian/_base/kdeedu/debian/man/indiserver-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kalzium-trinity.1 b/debian/_base/kdeedu/debian/man/kalzium-trinity.1
index 458a01f36..458a01f36 100644
--- a/debian/squeeze/kdeedu/debian/man/kalzium-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kalzium-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kanagram-trinity.1 b/debian/_base/kdeedu/debian/man/kanagram-trinity.1
index 4dd60c243..4dd60c243 100644
--- a/debian/squeeze/kdeedu/debian/man/kanagram-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kanagram-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kbruch-trinity.1 b/debian/_base/kdeedu/debian/man/kbruch-trinity.1
index 3f9646718..3f9646718 100644
--- a/debian/squeeze/kdeedu/debian/man/kbruch-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kbruch-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/keduca-shrinker-trinity.1 b/debian/_base/kdeedu/debian/man/keduca-shrinker-trinity.1
index 53715bed4..53715bed4 100644
--- a/debian/squeeze/kdeedu/debian/man/keduca-shrinker-trinity.1
+++ b/debian/_base/kdeedu/debian/man/keduca-shrinker-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/keduca-trinity.1 b/debian/_base/kdeedu/debian/man/keduca-trinity.1
index 802444364..802444364 100644
--- a/debian/squeeze/kdeedu/debian/man/keduca-trinity.1
+++ b/debian/_base/kdeedu/debian/man/keduca-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/keducabuilder-trinity.1 b/debian/_base/kdeedu/debian/man/keducabuilder-trinity.1
index 3f3e62554..3f3e62554 100644
--- a/debian/squeeze/kdeedu/debian/man/keducabuilder-trinity.1
+++ b/debian/_base/kdeedu/debian/man/keducabuilder-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kgeography-trinity.1 b/debian/_base/kdeedu/debian/man/kgeography-trinity.1
index 550f88394..550f88394 100644
--- a/debian/squeeze/kdeedu/debian/man/kgeography-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kgeography-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/khangman-trinity.1 b/debian/_base/kdeedu/debian/man/khangman-trinity.1
index 6620e7ff2..6620e7ff2 100644
--- a/debian/squeeze/kdeedu/debian/man/khangman-trinity.1
+++ b/debian/_base/kdeedu/debian/man/khangman-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kig-trinity.1 b/debian/_base/kdeedu/debian/man/kig-trinity.1
index a5b73cff1..a5b73cff1 100644
--- a/debian/squeeze/kdeedu/debian/man/kig-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kig-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kiten-trinity.1 b/debian/_base/kdeedu/debian/man/kiten-trinity.1
index 1c91ac6ef..1c91ac6ef 100644
--- a/debian/squeeze/kdeedu/debian/man/kiten-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kiten-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kitengen-trinity.1 b/debian/_base/kdeedu/debian/man/kitengen-trinity.1
index 35d59fe6a..35d59fe6a 100644
--- a/debian/squeeze/kdeedu/debian/man/kitengen-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kitengen-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/klatin-trinity.1 b/debian/_base/kdeedu/debian/man/klatin-trinity.1
index 3513adc99..3513adc99 100644
--- a/debian/squeeze/kdeedu/debian/man/klatin-trinity.1
+++ b/debian/_base/kdeedu/debian/man/klatin-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/klettres-trinity.1 b/debian/_base/kdeedu/debian/man/klettres-trinity.1
index ecd3149b7..ecd3149b7 100644
--- a/debian/squeeze/kdeedu/debian/man/klettres-trinity.1
+++ b/debian/_base/kdeedu/debian/man/klettres-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kmplot-trinity.1 b/debian/_base/kdeedu/debian/man/kmplot-trinity.1
index 77d7130d6..77d7130d6 100644
--- a/debian/squeeze/kdeedu/debian/man/kmplot-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kmplot-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kpercentage-trinity.1 b/debian/_base/kdeedu/debian/man/kpercentage-trinity.1
index 1fafd663a..1fafd663a 100644
--- a/debian/squeeze/kdeedu/debian/man/kpercentage-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kpercentage-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kstars-trinity.1 b/debian/_base/kdeedu/debian/man/kstars-trinity.1
index 589d72527..589d72527 100644
--- a/debian/squeeze/kdeedu/debian/man/kstars-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kstars-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/ktouch-trinity.1 b/debian/_base/kdeedu/debian/man/ktouch-trinity.1
index 4f5a917ec..4f5a917ec 100644
--- a/debian/squeeze/kdeedu/debian/man/ktouch-trinity.1
+++ b/debian/_base/kdeedu/debian/man/ktouch-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kturtle-trinity.1 b/debian/_base/kdeedu/debian/man/kturtle-trinity.1
index 80a139e03..80a139e03 100644
--- a/debian/squeeze/kdeedu/debian/man/kturtle-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kturtle-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kverbos-trinity.1 b/debian/_base/kdeedu/debian/man/kverbos-trinity.1
index b2207dd44..b2207dd44 100644
--- a/debian/squeeze/kdeedu/debian/man/kverbos-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kverbos-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kvoctrain-trinity.1 b/debian/_base/kdeedu/debian/man/kvoctrain-trinity.1
index bfbef8dc7..bfbef8dc7 100644
--- a/debian/squeeze/kdeedu/debian/man/kvoctrain-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kvoctrain-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/kwordquiz-trinity.1 b/debian/_base/kdeedu/debian/man/kwordquiz-trinity.1
index b3508f99e..b3508f99e 100644
--- a/debian/squeeze/kdeedu/debian/man/kwordquiz-trinity.1
+++ b/debian/_base/kdeedu/debian/man/kwordquiz-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/langen2kvtml-trinity.1 b/debian/_base/kdeedu/debian/man/langen2kvtml-trinity.1
index a48bfc713..a48bfc713 100644
--- a/debian/squeeze/kdeedu/debian/man/langen2kvtml-trinity.1
+++ b/debian/_base/kdeedu/debian/man/langen2kvtml-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/lx200_16-trinity.1 b/debian/_base/kdeedu/debian/man/lx200_16-trinity.1
index 1ceb5b298..1ceb5b298 100644
--- a/debian/squeeze/kdeedu/debian/man/lx200_16-trinity.1
+++ b/debian/_base/kdeedu/debian/man/lx200_16-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/lx200autostar-trinity.1 b/debian/_base/kdeedu/debian/man/lx200autostar-trinity.1
index efc2f5e88..efc2f5e88 100644
--- a/debian/squeeze/kdeedu/debian/man/lx200autostar-trinity.1
+++ b/debian/_base/kdeedu/debian/man/lx200autostar-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/lx200classic-trinity.1 b/debian/_base/kdeedu/debian/man/lx200classic-trinity.1
index f785be32f..f785be32f 100644
--- a/debian/squeeze/kdeedu/debian/man/lx200classic-trinity.1
+++ b/debian/_base/kdeedu/debian/man/lx200classic-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/lx200generic-trinity.1 b/debian/_base/kdeedu/debian/man/lx200generic-trinity.1
index cb07e7d81..cb07e7d81 100644
--- a/debian/squeeze/kdeedu/debian/man/lx200generic-trinity.1
+++ b/debian/_base/kdeedu/debian/man/lx200generic-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/lx200gps-trinity.1 b/debian/_base/kdeedu/debian/man/lx200gps-trinity.1
index e0b4ccb33..e0b4ccb33 100644
--- a/debian/squeeze/kdeedu/debian/man/lx200gps-trinity.1
+++ b/debian/_base/kdeedu/debian/man/lx200gps-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/spotlight2kvtml-trinity.1 b/debian/_base/kdeedu/debian/man/spotlight2kvtml-trinity.1
index e3a4b5415..e3a4b5415 100644
--- a/debian/squeeze/kdeedu/debian/man/spotlight2kvtml-trinity.1
+++ b/debian/_base/kdeedu/debian/man/spotlight2kvtml-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/temma-trinity.1 b/debian/_base/kdeedu/debian/man/temma-trinity.1
index b88a146ae..b88a146ae 100644
--- a/debian/squeeze/kdeedu/debian/man/temma-trinity.1
+++ b/debian/_base/kdeedu/debian/man/temma-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/test_extdate-trinity.1 b/debian/_base/kdeedu/debian/man/test_extdate-trinity.1
index f515e0d87..f515e0d87 100644
--- a/debian/squeeze/kdeedu/debian/man/test_extdate-trinity.1
+++ b/debian/_base/kdeedu/debian/man/test_extdate-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/test_extdatepicker-trinity.1 b/debian/_base/kdeedu/debian/man/test_extdatepicker-trinity.1
index c207c51d8..c207c51d8 100644
--- a/debian/squeeze/kdeedu/debian/man/test_extdatepicker-trinity.1
+++ b/debian/_base/kdeedu/debian/man/test_extdatepicker-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/v4ldriver-trinity.1 b/debian/_base/kdeedu/debian/man/v4ldriver-trinity.1
index 0fc1eca24..0fc1eca24 100644
--- a/debian/squeeze/kdeedu/debian/man/v4ldriver-trinity.1
+++ b/debian/_base/kdeedu/debian/man/v4ldriver-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/man/v4lphilips-trinity.1 b/debian/_base/kdeedu/debian/man/v4lphilips-trinity.1
index 4511e30c3..4511e30c3 100644
--- a/debian/squeeze/kdeedu/debian/man/v4lphilips-trinity.1
+++ b/debian/_base/kdeedu/debian/man/v4lphilips-trinity.1
diff --git a/debian/squeeze/kdeedu/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdeedu/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdeedu/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdeedu/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdeedu/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdeedu/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdeedu/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdeedu/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdeedu/debian/patches/series b/debian/_base/kdeedu/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdeedu/debian/patches/series
+++ b/debian/_base/kdeedu/debian/patches/series
diff --git a/debian/squeeze/kdeedu/debian/rules b/debian/_base/kdeedu/debian/rules
index cb62b898c..cb62b898c 100755
--- a/debian/squeeze/kdeedu/debian/rules
+++ b/debian/_base/kdeedu/debian/rules
diff --git a/debian/squeeze/kdeedu/debian/source/format b/debian/_base/kdeedu/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdeedu/debian/source/format
+++ b/debian/_base/kdeedu/debian/source/format
diff --git a/debian/squeeze/kdeedu/debian/source/options b/debian/_base/kdeedu/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdeedu/debian/source/options
+++ b/debian/_base/kdeedu/debian/source/options
diff --git a/debian/squeeze/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
index e51f03050..e51f03050 100644
--- a/debian/squeeze/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdegames/debian/atlantik-trinity-dev.install b/debian/_base/kdegames/debian/atlantik-trinity-dev.install
index b9052ce9a..b9052ce9a 100644
--- a/debian/squeeze/kdegames/debian/atlantik-trinity-dev.install
+++ b/debian/_base/kdegames/debian/atlantik-trinity-dev.install
diff --git a/debian/squeeze/kdegames/debian/atlantik-trinity.install b/debian/_base/kdegames/debian/atlantik-trinity.install
index d1c3e9730..d1c3e9730 100644
--- a/debian/squeeze/kdegames/debian/atlantik-trinity.install
+++ b/debian/_base/kdegames/debian/atlantik-trinity.install
diff --git a/debian/squeeze/kdegames/debian/atlantik-trinity.links b/debian/_base/kdegames/debian/atlantik-trinity.links
index b368efade..b368efade 100644
--- a/debian/squeeze/kdegames/debian/atlantik-trinity.links
+++ b/debian/_base/kdegames/debian/atlantik-trinity.links
diff --git a/debian/squeeze/kdegames/debian/atlantik-trinity.manpages b/debian/_base/kdegames/debian/atlantik-trinity.manpages
index ba9602ad7..ba9602ad7 100644
--- a/debian/squeeze/kdegames/debian/atlantik-trinity.manpages
+++ b/debian/_base/kdegames/debian/atlantik-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/atlantik-trinity.menu b/debian/_base/kdegames/debian/atlantik-trinity.menu
index 116271705..116271705 100644
--- a/debian/squeeze/kdegames/debian/atlantik-trinity.menu
+++ b/debian/_base/kdegames/debian/atlantik-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdegames/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/debian/squeeze/kdegames/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdegames/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdegames/debian/cdbs/kde.mk b/debian/_base/kdegames/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdegames/debian/cdbs/kde.mk
+++ b/debian/_base/kdegames/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdegames/debian/cdbs/versions.pl b/debian/_base/kdegames/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdegames/debian/cdbs/versions.pl
+++ b/debian/_base/kdegames/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdegames/debian/changelog b/debian/_base/kdegames/debian/changelog
index 1ca7df725..1ca7df725 100644
--- a/debian/squeeze/kdegames/debian/changelog
+++ b/debian/_base/kdegames/debian/changelog
diff --git a/debian/squeeze/kdegames/debian/compat b/debian/_base/kdegames/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdegames/debian/compat
+++ b/debian/_base/kdegames/debian/compat
diff --git a/debian/squeeze/kdegames/debian/control b/debian/_base/kdegames/debian/control
index 3e5dffa4a..3e5dffa4a 100644
--- a/debian/squeeze/kdegames/debian/control
+++ b/debian/_base/kdegames/debian/control
diff --git a/debian/squeeze/kdegames/debian/copyright b/debian/_base/kdegames/debian/copyright
index 051cacea9..051cacea9 100644
--- a/debian/squeeze/kdegames/debian/copyright
+++ b/debian/_base/kdegames/debian/copyright
diff --git a/debian/squeeze/kdegames/debian/icons/atlantik-16.xpm b/debian/_base/kdegames/debian/icons/atlantik-16.xpm
index 611f1f97a..611f1f97a 100644
--- a/debian/squeeze/kdegames/debian/icons/atlantik-16.xpm
+++ b/debian/_base/kdegames/debian/icons/atlantik-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/atlantik.xpm b/debian/_base/kdegames/debian/icons/atlantik.xpm
index bedcf6cc1..bedcf6cc1 100644
--- a/debian/squeeze/kdegames/debian/icons/atlantik.xpm
+++ b/debian/_base/kdegames/debian/icons/atlantik.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kasteroids-16.xpm b/debian/_base/kdegames/debian/icons/kasteroids-16.xpm
index c15e3b0ee..c15e3b0ee 100644
--- a/debian/squeeze/kdegames/debian/icons/kasteroids-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kasteroids-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kasteroids.xpm b/debian/_base/kdegames/debian/icons/kasteroids.xpm
index f73c45dee..f73c45dee 100644
--- a/debian/squeeze/kdegames/debian/icons/kasteroids.xpm
+++ b/debian/_base/kdegames/debian/icons/kasteroids.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/katomic-16.xpm b/debian/_base/kdegames/debian/icons/katomic-16.xpm
index 2d34f8adc..2d34f8adc 100644
--- a/debian/squeeze/kdegames/debian/icons/katomic-16.xpm
+++ b/debian/_base/kdegames/debian/icons/katomic-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/katomic.xpm b/debian/_base/kdegames/debian/icons/katomic.xpm
index d8cca7cf5..d8cca7cf5 100644
--- a/debian/squeeze/kdegames/debian/icons/katomic.xpm
+++ b/debian/_base/kdegames/debian/icons/katomic.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kbackgammon-16.xpm b/debian/_base/kdegames/debian/icons/kbackgammon-16.xpm
index 810a024dc..810a024dc 100644
--- a/debian/squeeze/kdegames/debian/icons/kbackgammon-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kbackgammon-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kbackgammon.xpm b/debian/_base/kdegames/debian/icons/kbackgammon.xpm
index 5cd453abb..5cd453abb 100644
--- a/debian/squeeze/kdegames/debian/icons/kbackgammon.xpm
+++ b/debian/_base/kdegames/debian/icons/kbackgammon.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kbattleship-16.xpm b/debian/_base/kdegames/debian/icons/kbattleship-16.xpm
index 907010be4..907010be4 100644
--- a/debian/squeeze/kdegames/debian/icons/kbattleship-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kbattleship-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kbattleship.xpm b/debian/_base/kdegames/debian/icons/kbattleship.xpm
index 2dd29f5f2..2dd29f5f2 100644
--- a/debian/squeeze/kdegames/debian/icons/kbattleship.xpm
+++ b/debian/_base/kdegames/debian/icons/kbattleship.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kblackbox-16.xpm b/debian/_base/kdegames/debian/icons/kblackbox-16.xpm
index 812f7db3d..812f7db3d 100644
--- a/debian/squeeze/kdegames/debian/icons/kblackbox-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kblackbox-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kblackbox.xpm b/debian/_base/kdegames/debian/icons/kblackbox.xpm
index 203307693..203307693 100644
--- a/debian/squeeze/kdegames/debian/icons/kblackbox.xpm
+++ b/debian/_base/kdegames/debian/icons/kblackbox.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kbounce-16.xpm b/debian/_base/kdegames/debian/icons/kbounce-16.xpm
index 28c9599ec..28c9599ec 100644
--- a/debian/squeeze/kdegames/debian/icons/kbounce-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kbounce-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kbounce.xpm b/debian/_base/kdegames/debian/icons/kbounce.xpm
index e4afdecc7..e4afdecc7 100644
--- a/debian/squeeze/kdegames/debian/icons/kbounce.xpm
+++ b/debian/_base/kdegames/debian/icons/kbounce.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kenolaba-16.xpm b/debian/_base/kdegames/debian/icons/kenolaba-16.xpm
index 413891e6f..413891e6f 100644
--- a/debian/squeeze/kdegames/debian/icons/kenolaba-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kenolaba-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kenolaba.xpm b/debian/_base/kdegames/debian/icons/kenolaba.xpm
index 84a592a58..84a592a58 100644
--- a/debian/squeeze/kdegames/debian/icons/kenolaba.xpm
+++ b/debian/_base/kdegames/debian/icons/kenolaba.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kfouleggs-16.xpm b/debian/_base/kdegames/debian/icons/kfouleggs-16.xpm
index 2c94b7951..2c94b7951 100644
--- a/debian/squeeze/kdegames/debian/icons/kfouleggs-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kfouleggs-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kfouleggs.xpm b/debian/_base/kdegames/debian/icons/kfouleggs.xpm
index 2d4b0458d..2d4b0458d 100644
--- a/debian/squeeze/kdegames/debian/icons/kfouleggs.xpm
+++ b/debian/_base/kdegames/debian/icons/kfouleggs.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kgoldrunner-16.xpm b/debian/_base/kdegames/debian/icons/kgoldrunner-16.xpm
index 16c4e1f92..16c4e1f92 100644
--- a/debian/squeeze/kdegames/debian/icons/kgoldrunner-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kgoldrunner-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kgoldrunner.xpm b/debian/_base/kdegames/debian/icons/kgoldrunner.xpm
index cba7cb4a2..cba7cb4a2 100644
--- a/debian/squeeze/kdegames/debian/icons/kgoldrunner.xpm
+++ b/debian/_base/kdegames/debian/icons/kgoldrunner.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kjumpingcube-16.xpm b/debian/_base/kdegames/debian/icons/kjumpingcube-16.xpm
index 384b87ba1..384b87ba1 100644
--- a/debian/squeeze/kdegames/debian/icons/kjumpingcube-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kjumpingcube-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kjumpingcube.xpm b/debian/_base/kdegames/debian/icons/kjumpingcube.xpm
index 147c70579..147c70579 100644
--- a/debian/squeeze/kdegames/debian/icons/kjumpingcube.xpm
+++ b/debian/_base/kdegames/debian/icons/kjumpingcube.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/klickety-16.xpm b/debian/_base/kdegames/debian/icons/klickety-16.xpm
index 8ab2f2cca..8ab2f2cca 100644
--- a/debian/squeeze/kdegames/debian/icons/klickety-16.xpm
+++ b/debian/_base/kdegames/debian/icons/klickety-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/klickety.xpm b/debian/_base/kdegames/debian/icons/klickety.xpm
index 65929998d..65929998d 100644
--- a/debian/squeeze/kdegames/debian/icons/klickety.xpm
+++ b/debian/_base/kdegames/debian/icons/klickety.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/klines-16.xpm b/debian/_base/kdegames/debian/icons/klines-16.xpm
index a8142f79a..a8142f79a 100644
--- a/debian/squeeze/kdegames/debian/icons/klines-16.xpm
+++ b/debian/_base/kdegames/debian/icons/klines-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/klines.xpm b/debian/_base/kdegames/debian/icons/klines.xpm
index a25489ec7..a25489ec7 100644
--- a/debian/squeeze/kdegames/debian/icons/klines.xpm
+++ b/debian/_base/kdegames/debian/icons/klines.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kmahjongg-16.xpm b/debian/_base/kdegames/debian/icons/kmahjongg-16.xpm
index 3c094c76e..3c094c76e 100644
--- a/debian/squeeze/kdegames/debian/icons/kmahjongg-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kmahjongg-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kmahjongg.xpm b/debian/_base/kdegames/debian/icons/kmahjongg.xpm
index 7fcd7db9b..7fcd7db9b 100644
--- a/debian/squeeze/kdegames/debian/icons/kmahjongg.xpm
+++ b/debian/_base/kdegames/debian/icons/kmahjongg.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kmines-16.xpm b/debian/_base/kdegames/debian/icons/kmines-16.xpm
index a6f31a084..a6f31a084 100644
--- a/debian/squeeze/kdegames/debian/icons/kmines-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kmines-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kmines.xpm b/debian/_base/kdegames/debian/icons/kmines.xpm
index 39cbdf984..39cbdf984 100644
--- a/debian/squeeze/kdegames/debian/icons/kmines.xpm
+++ b/debian/_base/kdegames/debian/icons/kmines.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/knetwalk-16.xpm b/debian/_base/kdegames/debian/icons/knetwalk-16.xpm
index f923a4ff3..f923a4ff3 100644
--- a/debian/squeeze/kdegames/debian/icons/knetwalk-16.xpm
+++ b/debian/_base/kdegames/debian/icons/knetwalk-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/knetwalk.xpm b/debian/_base/kdegames/debian/icons/knetwalk.xpm
index e0aff6cc6..e0aff6cc6 100644
--- a/debian/squeeze/kdegames/debian/icons/knetwalk.xpm
+++ b/debian/_base/kdegames/debian/icons/knetwalk.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kolf-16.xpm b/debian/_base/kdegames/debian/icons/kolf-16.xpm
index 94b1f4fc5..94b1f4fc5 100644
--- a/debian/squeeze/kdegames/debian/icons/kolf-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kolf-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kolf.xpm b/debian/_base/kdegames/debian/icons/kolf.xpm
index 329420de4..329420de4 100644
--- a/debian/squeeze/kdegames/debian/icons/kolf.xpm
+++ b/debian/_base/kdegames/debian/icons/kolf.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/konquest-16.xpm b/debian/_base/kdegames/debian/icons/konquest-16.xpm
index b2e9e24e0..b2e9e24e0 100644
--- a/debian/squeeze/kdegames/debian/icons/konquest-16.xpm
+++ b/debian/_base/kdegames/debian/icons/konquest-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/konquest.xpm b/debian/_base/kdegames/debian/icons/konquest.xpm
index 127f8d9f7..127f8d9f7 100644
--- a/debian/squeeze/kdegames/debian/icons/konquest.xpm
+++ b/debian/_base/kdegames/debian/icons/konquest.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kpat-16.xpm b/debian/_base/kdegames/debian/icons/kpat-16.xpm
index 42d177db4..42d177db4 100644
--- a/debian/squeeze/kdegames/debian/icons/kpat-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kpat-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kpat.xpm b/debian/_base/kdegames/debian/icons/kpat.xpm
index 251453768..251453768 100644
--- a/debian/squeeze/kdegames/debian/icons/kpat.xpm
+++ b/debian/_base/kdegames/debian/icons/kpat.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kpoker-16.xpm b/debian/_base/kdegames/debian/icons/kpoker-16.xpm
index 69e381b74..69e381b74 100644
--- a/debian/squeeze/kdegames/debian/icons/kpoker-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kpoker-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kpoker.xpm b/debian/_base/kdegames/debian/icons/kpoker.xpm
index dda5699a5..dda5699a5 100644
--- a/debian/squeeze/kdegames/debian/icons/kpoker.xpm
+++ b/debian/_base/kdegames/debian/icons/kpoker.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kreversi-16.xpm b/debian/_base/kdegames/debian/icons/kreversi-16.xpm
index 47f24e1fd..47f24e1fd 100644
--- a/debian/squeeze/kdegames/debian/icons/kreversi-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kreversi-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kreversi.xpm b/debian/_base/kdegames/debian/icons/kreversi.xpm
index 01bb944e1..01bb944e1 100644
--- a/debian/squeeze/kdegames/debian/icons/kreversi.xpm
+++ b/debian/_base/kdegames/debian/icons/kreversi.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksame-16.xpm b/debian/_base/kdegames/debian/icons/ksame-16.xpm
index 0981cde6d..0981cde6d 100644
--- a/debian/squeeze/kdegames/debian/icons/ksame-16.xpm
+++ b/debian/_base/kdegames/debian/icons/ksame-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksame.xpm b/debian/_base/kdegames/debian/icons/ksame.xpm
index 9d899f425..9d899f425 100644
--- a/debian/squeeze/kdegames/debian/icons/ksame.xpm
+++ b/debian/_base/kdegames/debian/icons/ksame.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kshisen-16.xpm b/debian/_base/kdegames/debian/icons/kshisen-16.xpm
index f9d1f3c3c..f9d1f3c3c 100644
--- a/debian/squeeze/kdegames/debian/icons/kshisen-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kshisen-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kshisen.xpm b/debian/_base/kdegames/debian/icons/kshisen.xpm
index 0e78d3b92..0e78d3b92 100644
--- a/debian/squeeze/kdegames/debian/icons/kshisen.xpm
+++ b/debian/_base/kdegames/debian/icons/kshisen.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksirtet-16.xpm b/debian/_base/kdegames/debian/icons/ksirtet-16.xpm
index 8c5f2bf6a..8c5f2bf6a 100644
--- a/debian/squeeze/kdegames/debian/icons/ksirtet-16.xpm
+++ b/debian/_base/kdegames/debian/icons/ksirtet-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksirtet.xpm b/debian/_base/kdegames/debian/icons/ksirtet.xpm
index 708a1f89e..708a1f89e 100644
--- a/debian/squeeze/kdegames/debian/icons/ksirtet.xpm
+++ b/debian/_base/kdegames/debian/icons/ksirtet.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksmiletris-16.xpm b/debian/_base/kdegames/debian/icons/ksmiletris-16.xpm
index ce6fbe8a9..ce6fbe8a9 100644
--- a/debian/squeeze/kdegames/debian/icons/ksmiletris-16.xpm
+++ b/debian/_base/kdegames/debian/icons/ksmiletris-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksmiletris.xpm b/debian/_base/kdegames/debian/icons/ksmiletris.xpm
index c7832aacd..c7832aacd 100644
--- a/debian/squeeze/kdegames/debian/icons/ksmiletris.xpm
+++ b/debian/_base/kdegames/debian/icons/ksmiletris.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksnake-16.xpm b/debian/_base/kdegames/debian/icons/ksnake-16.xpm
index 409b95396..409b95396 100644
--- a/debian/squeeze/kdegames/debian/icons/ksnake-16.xpm
+++ b/debian/_base/kdegames/debian/icons/ksnake-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksnake.xpm b/debian/_base/kdegames/debian/icons/ksnake.xpm
index 339e31d8a..339e31d8a 100644
--- a/debian/squeeze/kdegames/debian/icons/ksnake.xpm
+++ b/debian/_base/kdegames/debian/icons/ksnake.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksokoban-16.xpm b/debian/_base/kdegames/debian/icons/ksokoban-16.xpm
index 0424d09f5..0424d09f5 100644
--- a/debian/squeeze/kdegames/debian/icons/ksokoban-16.xpm
+++ b/debian/_base/kdegames/debian/icons/ksokoban-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ksokoban.xpm b/debian/_base/kdegames/debian/icons/ksokoban.xpm
index 6b9c52381..6b9c52381 100644
--- a/debian/squeeze/kdegames/debian/icons/ksokoban.xpm
+++ b/debian/_base/kdegames/debian/icons/ksokoban.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kspaceduel-16.xpm b/debian/_base/kdegames/debian/icons/kspaceduel-16.xpm
index 911acb1cf..911acb1cf 100644
--- a/debian/squeeze/kdegames/debian/icons/kspaceduel-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kspaceduel-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kspaceduel.xpm b/debian/_base/kdegames/debian/icons/kspaceduel.xpm
index 0529f7ac5..0529f7ac5 100644
--- a/debian/squeeze/kdegames/debian/icons/kspaceduel.xpm
+++ b/debian/_base/kdegames/debian/icons/kspaceduel.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ktron-16.xpm b/debian/_base/kdegames/debian/icons/ktron-16.xpm
index abaf26411..abaf26411 100644
--- a/debian/squeeze/kdegames/debian/icons/ktron-16.xpm
+++ b/debian/_base/kdegames/debian/icons/ktron-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ktron.xpm b/debian/_base/kdegames/debian/icons/ktron.xpm
index 346a45d5e..346a45d5e 100644
--- a/debian/squeeze/kdegames/debian/icons/ktron.xpm
+++ b/debian/_base/kdegames/debian/icons/ktron.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ktuberling-16.xpm b/debian/_base/kdegames/debian/icons/ktuberling-16.xpm
index 94ec16e57..94ec16e57 100644
--- a/debian/squeeze/kdegames/debian/icons/ktuberling-16.xpm
+++ b/debian/_base/kdegames/debian/icons/ktuberling-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/ktuberling.xpm b/debian/_base/kdegames/debian/icons/ktuberling.xpm
index 8d3240633..8d3240633 100644
--- a/debian/squeeze/kdegames/debian/icons/ktuberling.xpm
+++ b/debian/_base/kdegames/debian/icons/ktuberling.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kwin4-16.xpm b/debian/_base/kdegames/debian/icons/kwin4-16.xpm
index 2bad59cf8..2bad59cf8 100644
--- a/debian/squeeze/kdegames/debian/icons/kwin4-16.xpm
+++ b/debian/_base/kdegames/debian/icons/kwin4-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/kwin4.xpm b/debian/_base/kdegames/debian/icons/kwin4.xpm
index 43b466224..43b466224 100644
--- a/debian/squeeze/kdegames/debian/icons/kwin4.xpm
+++ b/debian/_base/kdegames/debian/icons/kwin4.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/lskat-16.xpm b/debian/_base/kdegames/debian/icons/lskat-16.xpm
index 8fb679d0e..8fb679d0e 100644
--- a/debian/squeeze/kdegames/debian/icons/lskat-16.xpm
+++ b/debian/_base/kdegames/debian/icons/lskat-16.xpm
diff --git a/debian/squeeze/kdegames/debian/icons/lskat.xpm b/debian/_base/kdegames/debian/icons/lskat.xpm
index e24ed07ef..e24ed07ef 100644
--- a/debian/squeeze/kdegames/debian/icons/lskat.xpm
+++ b/debian/_base/kdegames/debian/icons/lskat.xpm
diff --git a/debian/squeeze/kdegames/debian/kasteroids-trinity.install b/debian/_base/kdegames/debian/kasteroids-trinity.install
index ae24b2a78..ae24b2a78 100644
--- a/debian/squeeze/kdegames/debian/kasteroids-trinity.install
+++ b/debian/_base/kdegames/debian/kasteroids-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kasteroids-trinity.links b/debian/_base/kdegames/debian/kasteroids-trinity.links
index 5e93c0fe3..5e93c0fe3 100644
--- a/debian/squeeze/kdegames/debian/kasteroids-trinity.links
+++ b/debian/_base/kdegames/debian/kasteroids-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kasteroids-trinity.manpages b/debian/_base/kdegames/debian/kasteroids-trinity.manpages
index 3155d6e18..3155d6e18 100644
--- a/debian/squeeze/kdegames/debian/kasteroids-trinity.manpages
+++ b/debian/_base/kdegames/debian/kasteroids-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kasteroids-trinity.menu b/debian/_base/kdegames/debian/kasteroids-trinity.menu
index e8eb57662..e8eb57662 100644
--- a/debian/squeeze/kdegames/debian/kasteroids-trinity.menu
+++ b/debian/_base/kdegames/debian/kasteroids-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/katomic-trinity.install b/debian/_base/kdegames/debian/katomic-trinity.install
index fca842275..fca842275 100644
--- a/debian/squeeze/kdegames/debian/katomic-trinity.install
+++ b/debian/_base/kdegames/debian/katomic-trinity.install
diff --git a/debian/squeeze/kdegames/debian/katomic-trinity.links b/debian/_base/kdegames/debian/katomic-trinity.links
index e254acaa5..e254acaa5 100644
--- a/debian/squeeze/kdegames/debian/katomic-trinity.links
+++ b/debian/_base/kdegames/debian/katomic-trinity.links
diff --git a/debian/squeeze/kdegames/debian/katomic-trinity.manpages b/debian/_base/kdegames/debian/katomic-trinity.manpages
index fb19d0803..fb19d0803 100644
--- a/debian/squeeze/kdegames/debian/katomic-trinity.manpages
+++ b/debian/_base/kdegames/debian/katomic-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/katomic-trinity.menu b/debian/_base/kdegames/debian/katomic-trinity.menu
index cf426c63e..cf426c63e 100644
--- a/debian/squeeze/kdegames/debian/katomic-trinity.menu
+++ b/debian/_base/kdegames/debian/katomic-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kbackgammon-trinity.install b/debian/_base/kdegames/debian/kbackgammon-trinity.install
index 41b81b789..41b81b789 100644
--- a/debian/squeeze/kdegames/debian/kbackgammon-trinity.install
+++ b/debian/_base/kdegames/debian/kbackgammon-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kbackgammon-trinity.links b/debian/_base/kdegames/debian/kbackgammon-trinity.links
index 0aeb5b85c..0aeb5b85c 100644
--- a/debian/squeeze/kdegames/debian/kbackgammon-trinity.links
+++ b/debian/_base/kdegames/debian/kbackgammon-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kbackgammon-trinity.manpages b/debian/_base/kdegames/debian/kbackgammon-trinity.manpages
index 62d51aced..62d51aced 100644
--- a/debian/squeeze/kdegames/debian/kbackgammon-trinity.manpages
+++ b/debian/_base/kdegames/debian/kbackgammon-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kbackgammon-trinity.menu b/debian/_base/kdegames/debian/kbackgammon-trinity.menu
index bb187d03a..bb187d03a 100644
--- a/debian/squeeze/kdegames/debian/kbackgammon-trinity.menu
+++ b/debian/_base/kdegames/debian/kbackgammon-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kbattleship-trinity.install b/debian/_base/kdegames/debian/kbattleship-trinity.install
index 68a6e39ca..68a6e39ca 100644
--- a/debian/squeeze/kdegames/debian/kbattleship-trinity.install
+++ b/debian/_base/kdegames/debian/kbattleship-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kbattleship-trinity.links b/debian/_base/kdegames/debian/kbattleship-trinity.links
index 5db9ac11d..5db9ac11d 100644
--- a/debian/squeeze/kdegames/debian/kbattleship-trinity.links
+++ b/debian/_base/kdegames/debian/kbattleship-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kbattleship-trinity.manpages b/debian/_base/kdegames/debian/kbattleship-trinity.manpages
index 87cb14840..87cb14840 100644
--- a/debian/squeeze/kdegames/debian/kbattleship-trinity.manpages
+++ b/debian/_base/kdegames/debian/kbattleship-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kbattleship-trinity.menu b/debian/_base/kdegames/debian/kbattleship-trinity.menu
index f22f356a0..f22f356a0 100644
--- a/debian/squeeze/kdegames/debian/kbattleship-trinity.menu
+++ b/debian/_base/kdegames/debian/kbattleship-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kblackbox-trinity.install b/debian/_base/kdegames/debian/kblackbox-trinity.install
index d801df8cc..d801df8cc 100644
--- a/debian/squeeze/kdegames/debian/kblackbox-trinity.install
+++ b/debian/_base/kdegames/debian/kblackbox-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kblackbox-trinity.links b/debian/_base/kdegames/debian/kblackbox-trinity.links
index 13ff89735..13ff89735 100644
--- a/debian/squeeze/kdegames/debian/kblackbox-trinity.links
+++ b/debian/_base/kdegames/debian/kblackbox-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kblackbox-trinity.manpages b/debian/_base/kdegames/debian/kblackbox-trinity.manpages
index 768db9c03..768db9c03 100644
--- a/debian/squeeze/kdegames/debian/kblackbox-trinity.manpages
+++ b/debian/_base/kdegames/debian/kblackbox-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kblackbox-trinity.menu b/debian/_base/kdegames/debian/kblackbox-trinity.menu
index 008eaf055..008eaf055 100644
--- a/debian/squeeze/kdegames/debian/kblackbox-trinity.menu
+++ b/debian/_base/kdegames/debian/kblackbox-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kbounce-trinity.install b/debian/_base/kdegames/debian/kbounce-trinity.install
index 7c9bac7b3..7c9bac7b3 100644
--- a/debian/squeeze/kdegames/debian/kbounce-trinity.install
+++ b/debian/_base/kdegames/debian/kbounce-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kbounce-trinity.links b/debian/_base/kdegames/debian/kbounce-trinity.links
index 5e91fe04e..5e91fe04e 100644
--- a/debian/squeeze/kdegames/debian/kbounce-trinity.links
+++ b/debian/_base/kdegames/debian/kbounce-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kbounce-trinity.manpages b/debian/_base/kdegames/debian/kbounce-trinity.manpages
index dd3a2fdfa..dd3a2fdfa 100644
--- a/debian/squeeze/kdegames/debian/kbounce-trinity.manpages
+++ b/debian/_base/kdegames/debian/kbounce-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kbounce-trinity.menu b/debian/_base/kdegames/debian/kbounce-trinity.menu
index c4763e539..c4763e539 100644
--- a/debian/squeeze/kdegames/debian/kbounce-trinity.menu
+++ b/debian/_base/kdegames/debian/kbounce-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kdegames-card-data-trinity.install b/debian/_base/kdegames/debian/kdegames-card-data-trinity.install
index 32fae70ae..32fae70ae 100644
--- a/debian/squeeze/kdegames/debian/kdegames-card-data-trinity.install
+++ b/debian/_base/kdegames/debian/kdegames-card-data-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.atlantik b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.atlantik
index fba9537c5..fba9537c5 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.atlantik
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.atlantik
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kasteroids b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kasteroids
index 851c85085..851c85085 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kasteroids
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kasteroids
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.katomic b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.katomic
index 67b67a044..67b67a044 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.katomic
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.katomic
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon
index 63cebafb1..63cebafb1 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kbattleship b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kbattleship
index 8a1b92637..8a1b92637 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kbattleship
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kbattleship
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kblackbox b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kblackbox
index ceace853f..ceace853f 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kblackbox
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kblackbox
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kbounce b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kbounce
index 6b65d2382..6b65d2382 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kbounce
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kbounce
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kenolaba b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kenolaba
index 67c54bbb1..67c54bbb1 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kenolaba
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kenolaba
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs
index 0f393c64c..0f393c64c 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner
index 4dc7f17bd..4dc7f17bd 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube
index 2d665f0bf..2d665f0bf 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.klines b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.klines
index 362544594..362544594 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.klines
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.klines
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kmahjongg b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kmahjongg
index 7d8a22144..7d8a22144 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kmahjongg
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kmahjongg
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kmines b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kmines
index a2c446270..a2c446270 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kmines
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kmines
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kolf b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kolf
index 5cc76ed65..5cc76ed65 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kolf
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kolf
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.konquest b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.konquest
index 15e9cfaf2..15e9cfaf2 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.konquest
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.konquest
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kpat b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kpat
index 32a2da72d..32a2da72d 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kpat
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kpat
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kpoker b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kpoker
index 0d41124e6..0d41124e6 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kpoker
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kpoker
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kreversi b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kreversi
index c2614c666..c2614c666 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kreversi
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kreversi
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ksame b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ksame
index f71b2f351..f71b2f351 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ksame
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ksame
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kshisen b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kshisen
index 6a159dad1..6a159dad1 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kshisen
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kshisen
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ksirtet b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ksirtet
index e09ac5c89..e09ac5c89 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ksirtet
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ksirtet
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ksnake b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ksnake
index fc3daf3a2..fc3daf3a2 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ksnake
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ksnake
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ksokoban b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ksokoban
index 152c20ea0..152c20ea0 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ksokoban
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ksokoban
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel
index 34af6ca0b..34af6ca0b 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ktron b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ktron
index 30290f9bc..30290f9bc 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ktron
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ktron
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ktuberling b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ktuberling
index 1f2ce6736..1f2ce6736 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.ktuberling
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.ktuberling
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kwin4 b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kwin4
index 18c186bef..18c186bef 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.kwin4
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.kwin4
diff --git a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.lskat b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.lskat
index 2516f5efc..2516f5efc 100644
--- a/debian/squeeze/kdegames/debian/kdegames-doc-html.doc-base.lskat
+++ b/debian/_base/kdegames/debian/kdegames-doc-html.doc-base.lskat
diff --git a/debian/squeeze/kdegames/debian/kenolaba-trinity.install b/debian/_base/kdegames/debian/kenolaba-trinity.install
index 121e8ae52..121e8ae52 100644
--- a/debian/squeeze/kdegames/debian/kenolaba-trinity.install
+++ b/debian/_base/kdegames/debian/kenolaba-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kenolaba-trinity.links b/debian/_base/kdegames/debian/kenolaba-trinity.links
index 03980edc3..03980edc3 100644
--- a/debian/squeeze/kdegames/debian/kenolaba-trinity.links
+++ b/debian/_base/kdegames/debian/kenolaba-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kenolaba-trinity.manpages b/debian/_base/kdegames/debian/kenolaba-trinity.manpages
index d39200c68..d39200c68 100644
--- a/debian/squeeze/kdegames/debian/kenolaba-trinity.manpages
+++ b/debian/_base/kdegames/debian/kenolaba-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kenolaba-trinity.menu b/debian/_base/kdegames/debian/kenolaba-trinity.menu
index 92c2eafb4..92c2eafb4 100644
--- a/debian/squeeze/kdegames/debian/kenolaba-trinity.menu
+++ b/debian/_base/kdegames/debian/kenolaba-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kfouleggs-trinity.install b/debian/_base/kdegames/debian/kfouleggs-trinity.install
index 4ceaf21df..4ceaf21df 100644
--- a/debian/squeeze/kdegames/debian/kfouleggs-trinity.install
+++ b/debian/_base/kdegames/debian/kfouleggs-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kfouleggs-trinity.links b/debian/_base/kdegames/debian/kfouleggs-trinity.links
index 5d1835277..5d1835277 100644
--- a/debian/squeeze/kdegames/debian/kfouleggs-trinity.links
+++ b/debian/_base/kdegames/debian/kfouleggs-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kfouleggs-trinity.manpages b/debian/_base/kdegames/debian/kfouleggs-trinity.manpages
index 033192e89..033192e89 100644
--- a/debian/squeeze/kdegames/debian/kfouleggs-trinity.manpages
+++ b/debian/_base/kdegames/debian/kfouleggs-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kfouleggs-trinity.menu b/debian/_base/kdegames/debian/kfouleggs-trinity.menu
index 0b5146d3d..0b5146d3d 100644
--- a/debian/squeeze/kdegames/debian/kfouleggs-trinity.menu
+++ b/debian/_base/kdegames/debian/kfouleggs-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kgoldrunner-trinity.install b/debian/_base/kdegames/debian/kgoldrunner-trinity.install
index 5283b997f..5283b997f 100644
--- a/debian/squeeze/kdegames/debian/kgoldrunner-trinity.install
+++ b/debian/_base/kdegames/debian/kgoldrunner-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kgoldrunner-trinity.links b/debian/_base/kdegames/debian/kgoldrunner-trinity.links
index 2a1164f25..2a1164f25 100644
--- a/debian/squeeze/kdegames/debian/kgoldrunner-trinity.links
+++ b/debian/_base/kdegames/debian/kgoldrunner-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kgoldrunner-trinity.manpages b/debian/_base/kdegames/debian/kgoldrunner-trinity.manpages
index c352557d4..c352557d4 100644
--- a/debian/squeeze/kdegames/debian/kgoldrunner-trinity.manpages
+++ b/debian/_base/kdegames/debian/kgoldrunner-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kgoldrunner-trinity.menu b/debian/_base/kdegames/debian/kgoldrunner-trinity.menu
index 879d0fa0d..879d0fa0d 100644
--- a/debian/squeeze/kdegames/debian/kgoldrunner-trinity.menu
+++ b/debian/_base/kdegames/debian/kgoldrunner-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kjumpingcube-trinity.install b/debian/_base/kdegames/debian/kjumpingcube-trinity.install
index c5532b2f6..c5532b2f6 100644
--- a/debian/squeeze/kdegames/debian/kjumpingcube-trinity.install
+++ b/debian/_base/kdegames/debian/kjumpingcube-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kjumpingcube-trinity.links b/debian/_base/kdegames/debian/kjumpingcube-trinity.links
index 037ef6838..037ef6838 100644
--- a/debian/squeeze/kdegames/debian/kjumpingcube-trinity.links
+++ b/debian/_base/kdegames/debian/kjumpingcube-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kjumpingcube-trinity.manpages b/debian/_base/kdegames/debian/kjumpingcube-trinity.manpages
index 3dcfe7015..3dcfe7015 100644
--- a/debian/squeeze/kdegames/debian/kjumpingcube-trinity.manpages
+++ b/debian/_base/kdegames/debian/kjumpingcube-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kjumpingcube-trinity.menu b/debian/_base/kdegames/debian/kjumpingcube-trinity.menu
index 8c3d8376b..8c3d8376b 100644
--- a/debian/squeeze/kdegames/debian/kjumpingcube-trinity.menu
+++ b/debian/_base/kdegames/debian/kjumpingcube-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/klickety-trinity.install b/debian/_base/kdegames/debian/klickety-trinity.install
index 65e89710d..65e89710d 100644
--- a/debian/squeeze/kdegames/debian/klickety-trinity.install
+++ b/debian/_base/kdegames/debian/klickety-trinity.install
diff --git a/debian/squeeze/kdegames/debian/klickety-trinity.links b/debian/_base/kdegames/debian/klickety-trinity.links
index f281e2ba6..f281e2ba6 100644
--- a/debian/squeeze/kdegames/debian/klickety-trinity.links
+++ b/debian/_base/kdegames/debian/klickety-trinity.links
diff --git a/debian/squeeze/kdegames/debian/klickety-trinity.manpages b/debian/_base/kdegames/debian/klickety-trinity.manpages
index 5c003f445..5c003f445 100644
--- a/debian/squeeze/kdegames/debian/klickety-trinity.manpages
+++ b/debian/_base/kdegames/debian/klickety-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/klickety-trinity.menu b/debian/_base/kdegames/debian/klickety-trinity.menu
index e18881c82..e18881c82 100644
--- a/debian/squeeze/kdegames/debian/klickety-trinity.menu
+++ b/debian/_base/kdegames/debian/klickety-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/klines-trinity.install b/debian/_base/kdegames/debian/klines-trinity.install
index ba07a9752..ba07a9752 100644
--- a/debian/squeeze/kdegames/debian/klines-trinity.install
+++ b/debian/_base/kdegames/debian/klines-trinity.install
diff --git a/debian/squeeze/kdegames/debian/klines-trinity.links b/debian/_base/kdegames/debian/klines-trinity.links
index 2b00aeb3e..2b00aeb3e 100644
--- a/debian/squeeze/kdegames/debian/klines-trinity.links
+++ b/debian/_base/kdegames/debian/klines-trinity.links
diff --git a/debian/squeeze/kdegames/debian/klines-trinity.manpages b/debian/_base/kdegames/debian/klines-trinity.manpages
index 2a4381d37..2a4381d37 100644
--- a/debian/squeeze/kdegames/debian/klines-trinity.manpages
+++ b/debian/_base/kdegames/debian/klines-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/klines-trinity.menu b/debian/_base/kdegames/debian/klines-trinity.menu
index 36fa06ff7..36fa06ff7 100644
--- a/debian/squeeze/kdegames/debian/klines-trinity.menu
+++ b/debian/_base/kdegames/debian/klines-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kmahjongg-trinity.install b/debian/_base/kdegames/debian/kmahjongg-trinity.install
index 19b225795..19b225795 100644
--- a/debian/squeeze/kdegames/debian/kmahjongg-trinity.install
+++ b/debian/_base/kdegames/debian/kmahjongg-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kmahjongg-trinity.manpages b/debian/_base/kdegames/debian/kmahjongg-trinity.manpages
index e951b29cc..e951b29cc 100644
--- a/debian/squeeze/kdegames/debian/kmahjongg-trinity.manpages
+++ b/debian/_base/kdegames/debian/kmahjongg-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kmahjongg-trinity.menu b/debian/_base/kdegames/debian/kmahjongg-trinity.menu
index a69063cfe..a69063cfe 100644
--- a/debian/squeeze/kdegames/debian/kmahjongg-trinity.menu
+++ b/debian/_base/kdegames/debian/kmahjongg-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kmines-trinity.install b/debian/_base/kdegames/debian/kmines-trinity.install
index bcf5ee654..bcf5ee654 100644
--- a/debian/squeeze/kdegames/debian/kmines-trinity.install
+++ b/debian/_base/kdegames/debian/kmines-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kmines-trinity.links b/debian/_base/kdegames/debian/kmines-trinity.links
index d1d5a86fd..d1d5a86fd 100644
--- a/debian/squeeze/kdegames/debian/kmines-trinity.links
+++ b/debian/_base/kdegames/debian/kmines-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kmines-trinity.manpages b/debian/_base/kdegames/debian/kmines-trinity.manpages
index f6100c64c..f6100c64c 100644
--- a/debian/squeeze/kdegames/debian/kmines-trinity.manpages
+++ b/debian/_base/kdegames/debian/kmines-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kmines-trinity.menu b/debian/_base/kdegames/debian/kmines-trinity.menu
index e74163e9d..e74163e9d 100644
--- a/debian/squeeze/kdegames/debian/kmines-trinity.menu
+++ b/debian/_base/kdegames/debian/kmines-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/knetwalk-trinity.install b/debian/_base/kdegames/debian/knetwalk-trinity.install
index a3a7adf42..a3a7adf42 100644
--- a/debian/squeeze/kdegames/debian/knetwalk-trinity.install
+++ b/debian/_base/kdegames/debian/knetwalk-trinity.install
diff --git a/debian/squeeze/kdegames/debian/knetwalk-trinity.manpages b/debian/_base/kdegames/debian/knetwalk-trinity.manpages
index e43789f1c..e43789f1c 100644
--- a/debian/squeeze/kdegames/debian/knetwalk-trinity.manpages
+++ b/debian/_base/kdegames/debian/knetwalk-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/knetwalk-trinity.menu b/debian/_base/kdegames/debian/knetwalk-trinity.menu
index 8e67087bc..8e67087bc 100644
--- a/debian/squeeze/kdegames/debian/knetwalk-trinity.menu
+++ b/debian/_base/kdegames/debian/knetwalk-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kolf-trinity-dev.install b/debian/_base/kdegames/debian/kolf-trinity-dev.install
index 4da86d1b2..4da86d1b2 100644
--- a/debian/squeeze/kdegames/debian/kolf-trinity-dev.install
+++ b/debian/_base/kdegames/debian/kolf-trinity-dev.install
diff --git a/debian/squeeze/kdegames/debian/kolf-trinity.install b/debian/_base/kdegames/debian/kolf-trinity.install
index cd186b0b5..cd186b0b5 100644
--- a/debian/squeeze/kdegames/debian/kolf-trinity.install
+++ b/debian/_base/kdegames/debian/kolf-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kolf-trinity.links b/debian/_base/kdegames/debian/kolf-trinity.links
index 8f0f830f5..8f0f830f5 100644
--- a/debian/squeeze/kdegames/debian/kolf-trinity.links
+++ b/debian/_base/kdegames/debian/kolf-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kolf-trinity.manpages b/debian/_base/kdegames/debian/kolf-trinity.manpages
index ddc5af1a2..ddc5af1a2 100644
--- a/debian/squeeze/kdegames/debian/kolf-trinity.manpages
+++ b/debian/_base/kdegames/debian/kolf-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kolf-trinity.menu b/debian/_base/kdegames/debian/kolf-trinity.menu
index c77a47477..c77a47477 100644
--- a/debian/squeeze/kdegames/debian/kolf-trinity.menu
+++ b/debian/_base/kdegames/debian/kolf-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/konquest-trinity.install b/debian/_base/kdegames/debian/konquest-trinity.install
index d858d2e29..d858d2e29 100644
--- a/debian/squeeze/kdegames/debian/konquest-trinity.install
+++ b/debian/_base/kdegames/debian/konquest-trinity.install
diff --git a/debian/squeeze/kdegames/debian/konquest-trinity.links b/debian/_base/kdegames/debian/konquest-trinity.links
index e57a10549..e57a10549 100644
--- a/debian/squeeze/kdegames/debian/konquest-trinity.links
+++ b/debian/_base/kdegames/debian/konquest-trinity.links
diff --git a/debian/squeeze/kdegames/debian/konquest-trinity.manpages b/debian/_base/kdegames/debian/konquest-trinity.manpages
index 75e03a8c5..75e03a8c5 100644
--- a/debian/squeeze/kdegames/debian/konquest-trinity.manpages
+++ b/debian/_base/kdegames/debian/konquest-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/konquest-trinity.menu b/debian/_base/kdegames/debian/konquest-trinity.menu
index 9f2056609..9f2056609 100644
--- a/debian/squeeze/kdegames/debian/konquest-trinity.menu
+++ b/debian/_base/kdegames/debian/konquest-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kpat-trinity.install b/debian/_base/kdegames/debian/kpat-trinity.install
index 1d7f45758..1d7f45758 100644
--- a/debian/squeeze/kdegames/debian/kpat-trinity.install
+++ b/debian/_base/kdegames/debian/kpat-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kpat-trinity.links b/debian/_base/kdegames/debian/kpat-trinity.links
index dbc291066..dbc291066 100644
--- a/debian/squeeze/kdegames/debian/kpat-trinity.links
+++ b/debian/_base/kdegames/debian/kpat-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kpat-trinity.manpages b/debian/_base/kdegames/debian/kpat-trinity.manpages
index d1da72ae5..d1da72ae5 100644
--- a/debian/squeeze/kdegames/debian/kpat-trinity.manpages
+++ b/debian/_base/kdegames/debian/kpat-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kpat-trinity.menu b/debian/_base/kdegames/debian/kpat-trinity.menu
index 84fc42bef..84fc42bef 100644
--- a/debian/squeeze/kdegames/debian/kpat-trinity.menu
+++ b/debian/_base/kdegames/debian/kpat-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kpoker-trinity.install b/debian/_base/kdegames/debian/kpoker-trinity.install
index 0f499209c..0f499209c 100644
--- a/debian/squeeze/kdegames/debian/kpoker-trinity.install
+++ b/debian/_base/kdegames/debian/kpoker-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kpoker-trinity.links b/debian/_base/kdegames/debian/kpoker-trinity.links
index 8d789b45e..8d789b45e 100644
--- a/debian/squeeze/kdegames/debian/kpoker-trinity.links
+++ b/debian/_base/kdegames/debian/kpoker-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kpoker-trinity.manpages b/debian/_base/kdegames/debian/kpoker-trinity.manpages
index 796a3f8bd..796a3f8bd 100644
--- a/debian/squeeze/kdegames/debian/kpoker-trinity.manpages
+++ b/debian/_base/kdegames/debian/kpoker-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kpoker-trinity.menu b/debian/_base/kdegames/debian/kpoker-trinity.menu
index 56ef86035..56ef86035 100644
--- a/debian/squeeze/kdegames/debian/kpoker-trinity.menu
+++ b/debian/_base/kdegames/debian/kpoker-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kreversi-trinity.install b/debian/_base/kdegames/debian/kreversi-trinity.install
index 981e8d7b0..981e8d7b0 100644
--- a/debian/squeeze/kdegames/debian/kreversi-trinity.install
+++ b/debian/_base/kdegames/debian/kreversi-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kreversi-trinity.links b/debian/_base/kdegames/debian/kreversi-trinity.links
index ad5f17a8f..ad5f17a8f 100644
--- a/debian/squeeze/kdegames/debian/kreversi-trinity.links
+++ b/debian/_base/kdegames/debian/kreversi-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kreversi-trinity.manpages b/debian/_base/kdegames/debian/kreversi-trinity.manpages
index 70897c051..70897c051 100644
--- a/debian/squeeze/kdegames/debian/kreversi-trinity.manpages
+++ b/debian/_base/kdegames/debian/kreversi-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kreversi-trinity.menu b/debian/_base/kdegames/debian/kreversi-trinity.menu
index aa29af9c4..aa29af9c4 100644
--- a/debian/squeeze/kdegames/debian/kreversi-trinity.menu
+++ b/debian/_base/kdegames/debian/kreversi-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/ksame-trinity.install b/debian/_base/kdegames/debian/ksame-trinity.install
index 1451960e7..1451960e7 100644
--- a/debian/squeeze/kdegames/debian/ksame-trinity.install
+++ b/debian/_base/kdegames/debian/ksame-trinity.install
diff --git a/debian/squeeze/kdegames/debian/ksame-trinity.links b/debian/_base/kdegames/debian/ksame-trinity.links
index 09425a104..09425a104 100644
--- a/debian/squeeze/kdegames/debian/ksame-trinity.links
+++ b/debian/_base/kdegames/debian/ksame-trinity.links
diff --git a/debian/squeeze/kdegames/debian/ksame-trinity.manpages b/debian/_base/kdegames/debian/ksame-trinity.manpages
index fcb8ade0e..fcb8ade0e 100644
--- a/debian/squeeze/kdegames/debian/ksame-trinity.manpages
+++ b/debian/_base/kdegames/debian/ksame-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/ksame-trinity.menu b/debian/_base/kdegames/debian/ksame-trinity.menu
index 47dfe1141..47dfe1141 100644
--- a/debian/squeeze/kdegames/debian/ksame-trinity.menu
+++ b/debian/_base/kdegames/debian/ksame-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kshisen-trinity.install b/debian/_base/kdegames/debian/kshisen-trinity.install
index b302633c0..b302633c0 100644
--- a/debian/squeeze/kdegames/debian/kshisen-trinity.install
+++ b/debian/_base/kdegames/debian/kshisen-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kshisen-trinity.links b/debian/_base/kdegames/debian/kshisen-trinity.links
index ae00c9136..ae00c9136 100644
--- a/debian/squeeze/kdegames/debian/kshisen-trinity.links
+++ b/debian/_base/kdegames/debian/kshisen-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kshisen-trinity.manpages b/debian/_base/kdegames/debian/kshisen-trinity.manpages
index c1a26757e..c1a26757e 100644
--- a/debian/squeeze/kdegames/debian/kshisen-trinity.manpages
+++ b/debian/_base/kdegames/debian/kshisen-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kshisen-trinity.menu b/debian/_base/kdegames/debian/kshisen-trinity.menu
index cc49eb3f2..cc49eb3f2 100644
--- a/debian/squeeze/kdegames/debian/kshisen-trinity.menu
+++ b/debian/_base/kdegames/debian/kshisen-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/ksirtet-trinity.install b/debian/_base/kdegames/debian/ksirtet-trinity.install
index 2de50860e..2de50860e 100644
--- a/debian/squeeze/kdegames/debian/ksirtet-trinity.install
+++ b/debian/_base/kdegames/debian/ksirtet-trinity.install
diff --git a/debian/squeeze/kdegames/debian/ksirtet-trinity.links b/debian/_base/kdegames/debian/ksirtet-trinity.links
index 220128ee9..220128ee9 100644
--- a/debian/squeeze/kdegames/debian/ksirtet-trinity.links
+++ b/debian/_base/kdegames/debian/ksirtet-trinity.links
diff --git a/debian/squeeze/kdegames/debian/ksirtet-trinity.manpages b/debian/_base/kdegames/debian/ksirtet-trinity.manpages
index 08a43dd5a..08a43dd5a 100644
--- a/debian/squeeze/kdegames/debian/ksirtet-trinity.manpages
+++ b/debian/_base/kdegames/debian/ksirtet-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/ksirtet-trinity.menu b/debian/_base/kdegames/debian/ksirtet-trinity.menu
index bdd1f23d1..bdd1f23d1 100644
--- a/debian/squeeze/kdegames/debian/ksirtet-trinity.menu
+++ b/debian/_base/kdegames/debian/ksirtet-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/ksmiletris-trinity.install b/debian/_base/kdegames/debian/ksmiletris-trinity.install
index 2db54f7ef..2db54f7ef 100644
--- a/debian/squeeze/kdegames/debian/ksmiletris-trinity.install
+++ b/debian/_base/kdegames/debian/ksmiletris-trinity.install
diff --git a/debian/squeeze/kdegames/debian/ksmiletris-trinity.manpages b/debian/_base/kdegames/debian/ksmiletris-trinity.manpages
index 7a07168e3..7a07168e3 100644
--- a/debian/squeeze/kdegames/debian/ksmiletris-trinity.manpages
+++ b/debian/_base/kdegames/debian/ksmiletris-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/ksmiletris-trinity.menu b/debian/_base/kdegames/debian/ksmiletris-trinity.menu
index 7df7ce4be..7df7ce4be 100644
--- a/debian/squeeze/kdegames/debian/ksmiletris-trinity.menu
+++ b/debian/_base/kdegames/debian/ksmiletris-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/ksnake-trinity.install b/debian/_base/kdegames/debian/ksnake-trinity.install
index 7f447dedb..7f447dedb 100644
--- a/debian/squeeze/kdegames/debian/ksnake-trinity.install
+++ b/debian/_base/kdegames/debian/ksnake-trinity.install
diff --git a/debian/squeeze/kdegames/debian/ksnake-trinity.links b/debian/_base/kdegames/debian/ksnake-trinity.links
index a790e936a..a790e936a 100644
--- a/debian/squeeze/kdegames/debian/ksnake-trinity.links
+++ b/debian/_base/kdegames/debian/ksnake-trinity.links
diff --git a/debian/squeeze/kdegames/debian/ksnake-trinity.manpages b/debian/_base/kdegames/debian/ksnake-trinity.manpages
index b477dd190..b477dd190 100644
--- a/debian/squeeze/kdegames/debian/ksnake-trinity.manpages
+++ b/debian/_base/kdegames/debian/ksnake-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/ksnake-trinity.menu b/debian/_base/kdegames/debian/ksnake-trinity.menu
index 621bb2c45..621bb2c45 100644
--- a/debian/squeeze/kdegames/debian/ksnake-trinity.menu
+++ b/debian/_base/kdegames/debian/ksnake-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/ksokoban-trinity.install b/debian/_base/kdegames/debian/ksokoban-trinity.install
index 00648dd8b..00648dd8b 100644
--- a/debian/squeeze/kdegames/debian/ksokoban-trinity.install
+++ b/debian/_base/kdegames/debian/ksokoban-trinity.install
diff --git a/debian/squeeze/kdegames/debian/ksokoban-trinity.links b/debian/_base/kdegames/debian/ksokoban-trinity.links
index 9930c3548..9930c3548 100644
--- a/debian/squeeze/kdegames/debian/ksokoban-trinity.links
+++ b/debian/_base/kdegames/debian/ksokoban-trinity.links
diff --git a/debian/squeeze/kdegames/debian/ksokoban-trinity.manpages b/debian/_base/kdegames/debian/ksokoban-trinity.manpages
index 502ee9496..502ee9496 100644
--- a/debian/squeeze/kdegames/debian/ksokoban-trinity.manpages
+++ b/debian/_base/kdegames/debian/ksokoban-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/ksokoban-trinity.menu b/debian/_base/kdegames/debian/ksokoban-trinity.menu
index 9477f6aad..9477f6aad 100644
--- a/debian/squeeze/kdegames/debian/ksokoban-trinity.menu
+++ b/debian/_base/kdegames/debian/ksokoban-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kspaceduel-trinity.install b/debian/_base/kdegames/debian/kspaceduel-trinity.install
index 559f89cdc..559f89cdc 100644
--- a/debian/squeeze/kdegames/debian/kspaceduel-trinity.install
+++ b/debian/_base/kdegames/debian/kspaceduel-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kspaceduel-trinity.links b/debian/_base/kdegames/debian/kspaceduel-trinity.links
index 0182b926b..0182b926b 100644
--- a/debian/squeeze/kdegames/debian/kspaceduel-trinity.links
+++ b/debian/_base/kdegames/debian/kspaceduel-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kspaceduel-trinity.manpages b/debian/_base/kdegames/debian/kspaceduel-trinity.manpages
index 8a48d9286..8a48d9286 100644
--- a/debian/squeeze/kdegames/debian/kspaceduel-trinity.manpages
+++ b/debian/_base/kdegames/debian/kspaceduel-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kspaceduel-trinity.menu b/debian/_base/kdegames/debian/kspaceduel-trinity.menu
index d42077726..d42077726 100644
--- a/debian/squeeze/kdegames/debian/kspaceduel-trinity.menu
+++ b/debian/_base/kdegames/debian/kspaceduel-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/ktron-trinity.install b/debian/_base/kdegames/debian/ktron-trinity.install
index 05bf663a5..05bf663a5 100644
--- a/debian/squeeze/kdegames/debian/ktron-trinity.install
+++ b/debian/_base/kdegames/debian/ktron-trinity.install
diff --git a/debian/squeeze/kdegames/debian/ktron-trinity.links b/debian/_base/kdegames/debian/ktron-trinity.links
index 1d133ef86..1d133ef86 100644
--- a/debian/squeeze/kdegames/debian/ktron-trinity.links
+++ b/debian/_base/kdegames/debian/ktron-trinity.links
diff --git a/debian/squeeze/kdegames/debian/ktron-trinity.manpages b/debian/_base/kdegames/debian/ktron-trinity.manpages
index c34c3e0bf..c34c3e0bf 100644
--- a/debian/squeeze/kdegames/debian/ktron-trinity.manpages
+++ b/debian/_base/kdegames/debian/ktron-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/ktron-trinity.menu b/debian/_base/kdegames/debian/ktron-trinity.menu
index a2c4c5466..a2c4c5466 100644
--- a/debian/squeeze/kdegames/debian/ktron-trinity.menu
+++ b/debian/_base/kdegames/debian/ktron-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/ktuberling-trinity.install b/debian/_base/kdegames/debian/ktuberling-trinity.install
index 098c979c8..098c979c8 100644
--- a/debian/squeeze/kdegames/debian/ktuberling-trinity.install
+++ b/debian/_base/kdegames/debian/ktuberling-trinity.install
diff --git a/debian/squeeze/kdegames/debian/ktuberling-trinity.links b/debian/_base/kdegames/debian/ktuberling-trinity.links
index 415a771ec..415a771ec 100644
--- a/debian/squeeze/kdegames/debian/ktuberling-trinity.links
+++ b/debian/_base/kdegames/debian/ktuberling-trinity.links
diff --git a/debian/squeeze/kdegames/debian/ktuberling-trinity.manpages b/debian/_base/kdegames/debian/ktuberling-trinity.manpages
index cde8002fa..cde8002fa 100644
--- a/debian/squeeze/kdegames/debian/ktuberling-trinity.manpages
+++ b/debian/_base/kdegames/debian/ktuberling-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/ktuberling-trinity.menu b/debian/_base/kdegames/debian/ktuberling-trinity.menu
index 5514bcfbc..5514bcfbc 100644
--- a/debian/squeeze/kdegames/debian/ktuberling-trinity.menu
+++ b/debian/_base/kdegames/debian/ktuberling-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/kwin4-trinity.install b/debian/_base/kdegames/debian/kwin4-trinity.install
index eb5b27e1f..eb5b27e1f 100644
--- a/debian/squeeze/kdegames/debian/kwin4-trinity.install
+++ b/debian/_base/kdegames/debian/kwin4-trinity.install
diff --git a/debian/squeeze/kdegames/debian/kwin4-trinity.links b/debian/_base/kdegames/debian/kwin4-trinity.links
index 0619c70a6..0619c70a6 100644
--- a/debian/squeeze/kdegames/debian/kwin4-trinity.links
+++ b/debian/_base/kdegames/debian/kwin4-trinity.links
diff --git a/debian/squeeze/kdegames/debian/kwin4-trinity.manpages b/debian/_base/kdegames/debian/kwin4-trinity.manpages
index 610e1c8e9..610e1c8e9 100644
--- a/debian/squeeze/kdegames/debian/kwin4-trinity.manpages
+++ b/debian/_base/kdegames/debian/kwin4-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/kwin4-trinity.menu b/debian/_base/kdegames/debian/kwin4-trinity.menu
index 0dc4d281f..0dc4d281f 100644
--- a/debian/squeeze/kdegames/debian/kwin4-trinity.menu
+++ b/debian/_base/kdegames/debian/kwin4-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/libkdegames-trinity-dev.install b/debian/_base/kdegames/debian/libkdegames-trinity-dev.install
index 921b88d08..921b88d08 100644
--- a/debian/squeeze/kdegames/debian/libkdegames-trinity-dev.install
+++ b/debian/_base/kdegames/debian/libkdegames-trinity-dev.install
diff --git a/debian/squeeze/kdegames/debian/libkdegames-trinity-doc.doc-base b/debian/_base/kdegames/debian/libkdegames-trinity-doc.doc-base
index 30492b65a..30492b65a 100644
--- a/debian/squeeze/kdegames/debian/libkdegames-trinity-doc.doc-base
+++ b/debian/_base/kdegames/debian/libkdegames-trinity-doc.doc-base
diff --git a/debian/squeeze/kdegames/debian/libkdegames-trinity-doc.install b/debian/_base/kdegames/debian/libkdegames-trinity-doc.install
index a223cd0c6..a223cd0c6 100644
--- a/debian/squeeze/kdegames/debian/libkdegames-trinity-doc.install
+++ b/debian/_base/kdegames/debian/libkdegames-trinity-doc.install
diff --git a/debian/squeeze/kdegames/debian/libkdegames-trinity-doc.links b/debian/_base/kdegames/debian/libkdegames-trinity-doc.links
index 4eee82d18..4eee82d18 100644
--- a/debian/squeeze/kdegames/debian/libkdegames-trinity-doc.links
+++ b/debian/_base/kdegames/debian/libkdegames-trinity-doc.links
diff --git a/debian/squeeze/kdegames/debian/libkdegames1-trinity.install b/debian/_base/kdegames/debian/libkdegames1-trinity.install
index 8fff1b082..8fff1b082 100644
--- a/debian/squeeze/kdegames/debian/libkdegames1-trinity.install
+++ b/debian/_base/kdegames/debian/libkdegames1-trinity.install
diff --git a/debian/squeeze/kdegames/debian/lskat-trinity.install b/debian/_base/kdegames/debian/lskat-trinity.install
index 7b301e9e0..7b301e9e0 100644
--- a/debian/squeeze/kdegames/debian/lskat-trinity.install
+++ b/debian/_base/kdegames/debian/lskat-trinity.install
diff --git a/debian/squeeze/kdegames/debian/lskat-trinity.links b/debian/_base/kdegames/debian/lskat-trinity.links
index 904bc2eab..904bc2eab 100644
--- a/debian/squeeze/kdegames/debian/lskat-trinity.links
+++ b/debian/_base/kdegames/debian/lskat-trinity.links
diff --git a/debian/squeeze/kdegames/debian/lskat-trinity.manpages b/debian/_base/kdegames/debian/lskat-trinity.manpages
index 728d1a013..728d1a013 100644
--- a/debian/squeeze/kdegames/debian/lskat-trinity.manpages
+++ b/debian/_base/kdegames/debian/lskat-trinity.manpages
diff --git a/debian/squeeze/kdegames/debian/lskat-trinity.menu b/debian/_base/kdegames/debian/lskat-trinity.menu
index d81800fa2..d81800fa2 100644
--- a/debian/squeeze/kdegames/debian/lskat-trinity.menu
+++ b/debian/_base/kdegames/debian/lskat-trinity.menu
diff --git a/debian/squeeze/kdegames/debian/man/atlantik-trinity.man b/debian/_base/kdegames/debian/man/atlantik-trinity.man
index 9d347120a..9d347120a 100644
--- a/debian/squeeze/kdegames/debian/man/atlantik-trinity.man
+++ b/debian/_base/kdegames/debian/man/atlantik-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kasteroids-trinity.man b/debian/_base/kdegames/debian/man/kasteroids-trinity.man
index 1c234f3fd..1c234f3fd 100644
--- a/debian/squeeze/kdegames/debian/man/kasteroids-trinity.man
+++ b/debian/_base/kdegames/debian/man/kasteroids-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/katomic-trinity.man b/debian/_base/kdegames/debian/man/katomic-trinity.man
index e03df7727..e03df7727 100644
--- a/debian/squeeze/kdegames/debian/man/katomic-trinity.man
+++ b/debian/_base/kdegames/debian/man/katomic-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kbackgammon-trinity.man b/debian/_base/kdegames/debian/man/kbackgammon-trinity.man
index 2893478c9..2893478c9 100644
--- a/debian/squeeze/kdegames/debian/man/kbackgammon-trinity.man
+++ b/debian/_base/kdegames/debian/man/kbackgammon-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kbattleship-trinity.man b/debian/_base/kdegames/debian/man/kbattleship-trinity.man
index 80b9e984c..80b9e984c 100644
--- a/debian/squeeze/kdegames/debian/man/kbattleship-trinity.man
+++ b/debian/_base/kdegames/debian/man/kbattleship-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kblackbox-trinity.man b/debian/_base/kdegames/debian/man/kblackbox-trinity.man
index 296ad1aa9..296ad1aa9 100644
--- a/debian/squeeze/kdegames/debian/man/kblackbox-trinity.man
+++ b/debian/_base/kdegames/debian/man/kblackbox-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kbounce-trinity.man b/debian/_base/kdegames/debian/man/kbounce-trinity.man
index 7559b6c46..7559b6c46 100644
--- a/debian/squeeze/kdegames/debian/man/kbounce-trinity.man
+++ b/debian/_base/kdegames/debian/man/kbounce-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kdeopt.part b/debian/_base/kdegames/debian/man/kdeopt.part
index e32a1a94d..e32a1a94d 100644
--- a/debian/squeeze/kdegames/debian/man/kdeopt.part
+++ b/debian/_base/kdegames/debian/man/kdeopt.part
diff --git a/debian/squeeze/kdegames/debian/man/kenolaba-trinity.man b/debian/_base/kdegames/debian/man/kenolaba-trinity.man
index 51c59a75f..51c59a75f 100644
--- a/debian/squeeze/kdegames/debian/man/kenolaba-trinity.man
+++ b/debian/_base/kdegames/debian/man/kenolaba-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kfouleggs-trinity.man b/debian/_base/kdegames/debian/man/kfouleggs-trinity.man
index 2f5a65e67..2f5a65e67 100644
--- a/debian/squeeze/kdegames/debian/man/kfouleggs-trinity.man
+++ b/debian/_base/kdegames/debian/man/kfouleggs-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kgoldrunner-trinity.man b/debian/_base/kdegames/debian/man/kgoldrunner-trinity.man
index 34ace1a34..34ace1a34 100644
--- a/debian/squeeze/kdegames/debian/man/kgoldrunner-trinity.man
+++ b/debian/_base/kdegames/debian/man/kgoldrunner-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kjumpingcube-trinity.man b/debian/_base/kdegames/debian/man/kjumpingcube-trinity.man
index 7d47914ad..7d47914ad 100644
--- a/debian/squeeze/kdegames/debian/man/kjumpingcube-trinity.man
+++ b/debian/_base/kdegames/debian/man/kjumpingcube-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/klickety-trinity.man b/debian/_base/kdegames/debian/man/klickety-trinity.man
index ce9de5acb..ce9de5acb 100644
--- a/debian/squeeze/kdegames/debian/man/klickety-trinity.man
+++ b/debian/_base/kdegames/debian/man/klickety-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/klines-trinity.man b/debian/_base/kdegames/debian/man/klines-trinity.man
index 8c53e1d8e..8c53e1d8e 100644
--- a/debian/squeeze/kdegames/debian/man/klines-trinity.man
+++ b/debian/_base/kdegames/debian/man/klines-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kmahjongg-trinity.man b/debian/_base/kdegames/debian/man/kmahjongg-trinity.man
index 1a3aaf86c..1a3aaf86c 100644
--- a/debian/squeeze/kdegames/debian/man/kmahjongg-trinity.man
+++ b/debian/_base/kdegames/debian/man/kmahjongg-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kmines-trinity.man b/debian/_base/kdegames/debian/man/kmines-trinity.man
index c18eb2e74..c18eb2e74 100644
--- a/debian/squeeze/kdegames/debian/man/kmines-trinity.man
+++ b/debian/_base/kdegames/debian/man/kmines-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/knetwalk-trinity.man b/debian/_base/kdegames/debian/man/knetwalk-trinity.man
index 0b934aa04..0b934aa04 100644
--- a/debian/squeeze/kdegames/debian/man/knetwalk-trinity.man
+++ b/debian/_base/kdegames/debian/man/knetwalk-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kolf-trinity.man b/debian/_base/kdegames/debian/man/kolf-trinity.man
index 47fa71ef3..47fa71ef3 100644
--- a/debian/squeeze/kdegames/debian/man/kolf-trinity.man
+++ b/debian/_base/kdegames/debian/man/kolf-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/konquest-trinity.man b/debian/_base/kdegames/debian/man/konquest-trinity.man
index 3fbef82d6..3fbef82d6 100644
--- a/debian/squeeze/kdegames/debian/man/konquest-trinity.man
+++ b/debian/_base/kdegames/debian/man/konquest-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kpat-trinity.man b/debian/_base/kdegames/debian/man/kpat-trinity.man
index a5f95956f..a5f95956f 100644
--- a/debian/squeeze/kdegames/debian/man/kpat-trinity.man
+++ b/debian/_base/kdegames/debian/man/kpat-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kpoker-trinity.man b/debian/_base/kdegames/debian/man/kpoker-trinity.man
index a8c9cd5ca..a8c9cd5ca 100644
--- a/debian/squeeze/kdegames/debian/man/kpoker-trinity.man
+++ b/debian/_base/kdegames/debian/man/kpoker-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kreversi-trinity.man b/debian/_base/kdegames/debian/man/kreversi-trinity.man
index efb22889b..efb22889b 100644
--- a/debian/squeeze/kdegames/debian/man/kreversi-trinity.man
+++ b/debian/_base/kdegames/debian/man/kreversi-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/ksame-trinity.man b/debian/_base/kdegames/debian/man/ksame-trinity.man
index dbde2bad0..dbde2bad0 100644
--- a/debian/squeeze/kdegames/debian/man/ksame-trinity.man
+++ b/debian/_base/kdegames/debian/man/ksame-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kshisen-trinity.man b/debian/_base/kdegames/debian/man/kshisen-trinity.man
index 54600a2be..54600a2be 100644
--- a/debian/squeeze/kdegames/debian/man/kshisen-trinity.man
+++ b/debian/_base/kdegames/debian/man/kshisen-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/ksirtet-trinity.man b/debian/_base/kdegames/debian/man/ksirtet-trinity.man
index d704c3685..d704c3685 100644
--- a/debian/squeeze/kdegames/debian/man/ksirtet-trinity.man
+++ b/debian/_base/kdegames/debian/man/ksirtet-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/ksmiletris-trinity.man b/debian/_base/kdegames/debian/man/ksmiletris-trinity.man
index 1711b49b3..1711b49b3 100644
--- a/debian/squeeze/kdegames/debian/man/ksmiletris-trinity.man
+++ b/debian/_base/kdegames/debian/man/ksmiletris-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/ksnake-trinity.man b/debian/_base/kdegames/debian/man/ksnake-trinity.man
index e789a6827..e789a6827 100644
--- a/debian/squeeze/kdegames/debian/man/ksnake-trinity.man
+++ b/debian/_base/kdegames/debian/man/ksnake-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/ksokoban-trinity.man b/debian/_base/kdegames/debian/man/ksokoban-trinity.man
index 1aab25ed9..1aab25ed9 100644
--- a/debian/squeeze/kdegames/debian/man/ksokoban-trinity.man
+++ b/debian/_base/kdegames/debian/man/ksokoban-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kspaceduel-trinity.man b/debian/_base/kdegames/debian/man/kspaceduel-trinity.man
index f743a72f0..f743a72f0 100644
--- a/debian/squeeze/kdegames/debian/man/kspaceduel-trinity.man
+++ b/debian/_base/kdegames/debian/man/kspaceduel-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/ktron-trinity.man b/debian/_base/kdegames/debian/man/ktron-trinity.man
index ed5fa31ec..ed5fa31ec 100644
--- a/debian/squeeze/kdegames/debian/man/ktron-trinity.man
+++ b/debian/_base/kdegames/debian/man/ktron-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/ktuberling-trinity.man b/debian/_base/kdegames/debian/man/ktuberling-trinity.man
index 103470edb..103470edb 100644
--- a/debian/squeeze/kdegames/debian/man/ktuberling-trinity.man
+++ b/debian/_base/kdegames/debian/man/ktuberling-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kwin4-trinity.man b/debian/_base/kdegames/debian/man/kwin4-trinity.man
index f1e3a0def..f1e3a0def 100644
--- a/debian/squeeze/kdegames/debian/man/kwin4-trinity.man
+++ b/debian/_base/kdegames/debian/man/kwin4-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/kwin4proc-trinity.man b/debian/_base/kdegames/debian/man/kwin4proc-trinity.man
index 3a8d08949..3a8d08949 100644
--- a/debian/squeeze/kdegames/debian/man/kwin4proc-trinity.man
+++ b/debian/_base/kdegames/debian/man/kwin4proc-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/lskat-trinity.man b/debian/_base/kdegames/debian/man/lskat-trinity.man
index 6ebaa3cda..6ebaa3cda 100644
--- a/debian/squeeze/kdegames/debian/man/lskat-trinity.man
+++ b/debian/_base/kdegames/debian/man/lskat-trinity.man
diff --git a/debian/squeeze/kdegames/debian/man/lskatproc-trinity.man b/debian/_base/kdegames/debian/man/lskatproc-trinity.man
index 091193208..091193208 100644
--- a/debian/squeeze/kdegames/debian/man/lskatproc-trinity.man
+++ b/debian/_base/kdegames/debian/man/lskatproc-trinity.man
diff --git a/debian/squeeze/kdegames/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdegames/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdegames/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdegames/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdegames/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdegames/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdegames/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdegames/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdegames/debian/patches/series b/debian/_base/kdegames/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdegames/debian/patches/series
+++ b/debian/_base/kdegames/debian/patches/series
diff --git a/debian/squeeze/kdegames/debian/rules b/debian/_base/kdegames/debian/rules
index d63ea6d30..d63ea6d30 100755
--- a/debian/squeeze/kdegames/debian/rules
+++ b/debian/_base/kdegames/debian/rules
diff --git a/debian/squeeze/kdegames/debian/source/format b/debian/_base/kdegames/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdegames/debian/source/format
+++ b/debian/_base/kdegames/debian/source/format
diff --git a/debian/squeeze/kdegames/debian/source/options b/debian/_base/kdegames/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdegames/debian/source/options
+++ b/debian/_base/kdegames/debian/source/options
diff --git a/debian/squeeze/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index b7d2adb39..b7d2adb39 100644
--- a/debian/squeeze/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index 479b8921c..479b8921c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdegraphics.automake/debian/cdbs/kde.mk b/debian/_base/kdegraphics.automake/debian/cdbs/kde.mk
index 6c6a346c4..6c6a346c4 100644
--- a/debian/squeeze/kdegraphics.automake/debian/cdbs/kde.mk
+++ b/debian/_base/kdegraphics.automake/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdegraphics.automake/debian/cdbs/versions.pl b/debian/_base/kdegraphics.automake/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/debian/squeeze/kdegraphics.automake/debian/cdbs/versions.pl
+++ b/debian/_base/kdegraphics.automake/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdegraphics.automake/debian/changelog b/debian/_base/kdegraphics.automake/debian/changelog
index 38be59fe0..38be59fe0 100644
--- a/debian/squeeze/kdegraphics.automake/debian/changelog
+++ b/debian/_base/kdegraphics.automake/debian/changelog
diff --git a/debian/squeeze/kdegraphics.automake/debian/compat b/debian/_base/kdegraphics.automake/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/debian/squeeze/kdegraphics.automake/debian/compat
+++ b/debian/_base/kdegraphics.automake/debian/compat
diff --git a/debian/squeeze/kdegraphics.automake/debian/control b/debian/_base/kdegraphics.automake/debian/control
index e44479575..e44479575 100644
--- a/debian/squeeze/kdegraphics.automake/debian/control
+++ b/debian/_base/kdegraphics.automake/debian/control
diff --git a/debian/squeeze/kdegraphics.automake/debian/copyright b/debian/_base/kdegraphics.automake/debian/copyright
index 13e809000..13e809000 100644
--- a/debian/squeeze/kdegraphics.automake/debian/copyright
+++ b/debian/_base/kdegraphics.automake/debian/copyright
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm
index 22a32da35..22a32da35 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kcolorchooser.xpm b/debian/_base/kdegraphics.automake/debian/icons/kcolorchooser.xpm
index 22d830b4b..22d830b4b 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kcolorchooser.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kcolorchooser.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kcoloredit-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kcoloredit-16.xpm
index 8e97bb914..8e97bb914 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kcoloredit-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kcoloredit-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kcoloredit.xpm b/debian/_base/kdegraphics.automake/debian/icons/kcoloredit.xpm
index 83b310ff0..83b310ff0 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kcoloredit.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kcoloredit.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kdvi-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kdvi-16.xpm
index db22767d4..db22767d4 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kdvi-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kdvi-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kdvi.xpm b/debian/_base/kdegraphics.automake/debian/icons/kdvi.xpm
index fe4db5b6c..fe4db5b6c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kdvi.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kdvi.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kfax-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kfax-16.xpm
index 48804f8a5..48804f8a5 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kfax-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kfax-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kfax.xpm b/debian/_base/kdegraphics.automake/debian/icons/kfax.xpm
index bd969b13a..bd969b13a 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kfax.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kfax.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kfaxview-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kfaxview-16.xpm
index f5b699dcb..f5b699dcb 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kfaxview-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kfaxview-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kfaxview.xpm b/debian/_base/kdegraphics.automake/debian/icons/kfaxview.xpm
index aea8354f4..aea8354f4 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kfaxview.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kfaxview.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kghostview-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kghostview-16.xpm
index ccb9fa8ae..ccb9fa8ae 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kghostview-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kghostview-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kghostview.xpm b/debian/_base/kdegraphics.automake/debian/icons/kghostview.xpm
index 38bb64331..38bb64331 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kghostview.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kghostview.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kiconedit-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kiconedit-16.xpm
index 857f5fe1c..857f5fe1c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kiconedit-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kiconedit-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kiconedit.xpm b/debian/_base/kdegraphics.automake/debian/icons/kiconedit.xpm
index 412544858..412544858 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kiconedit.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kiconedit.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kolourpaint-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kolourpaint-16.xpm
index 79cabaf05..79cabaf05 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kolourpaint-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kolourpaint-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kolourpaint.xpm b/debian/_base/kdegraphics.automake/debian/icons/kolourpaint.xpm
index 32eba9310..32eba9310 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kolourpaint.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kolourpaint.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kooka-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kooka-16.xpm
index 46cd10535..46cd10535 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kooka-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kooka-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kooka.xpm b/debian/_base/kdegraphics.automake/debian/icons/kooka.xpm
index c720c7d21..c720c7d21 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kooka.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kooka.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kpdf-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kpdf-16.xpm
index ce5082f88..ce5082f88 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kpdf-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kpdf-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kpdf.xpm b/debian/_base/kdegraphics.automake/debian/icons/kpdf.xpm
index ae032c341..ae032c341 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kpdf.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kpdf.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm
index c25f014f0..c25f014f0 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kpovmodeler.xpm b/debian/_base/kdegraphics.automake/debian/icons/kpovmodeler.xpm
index a998ccda9..a998ccda9 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kpovmodeler.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kpovmodeler.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kruler-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kruler-16.xpm
index 3e5a27d03..3e5a27d03 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kruler-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kruler-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kruler.xpm b/debian/_base/kdegraphics.automake/debian/icons/kruler.xpm
index 030fad1f5..030fad1f5 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kruler.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kruler.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/ksnapshot-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/ksnapshot-16.xpm
index f97cb30aa..f97cb30aa 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/ksnapshot-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/ksnapshot-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/ksnapshot.xpm b/debian/_base/kdegraphics.automake/debian/icons/ksnapshot.xpm
index 302c59d25..302c59d25 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/ksnapshot.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/ksnapshot.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kuickshow-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kuickshow-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kuickshow-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kuickshow.xpm b/debian/_base/kdegraphics.automake/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kuickshow.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kuickshow.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kview-16.xpm b/debian/_base/kdegraphics.automake/debian/icons/kview-16.xpm
index 886c4821b..886c4821b 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kview-16.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kview-16.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/icons/kview.xpm b/debian/_base/kdegraphics.automake/debian/icons/kview.xpm
index 606fc37e6..606fc37e6 100644
--- a/debian/squeeze/kdegraphics.automake/debian/icons/kview.xpm
+++ b/debian/_base/kdegraphics.automake/debian/icons/kview.xpm
diff --git a/debian/squeeze/kdegraphics.automake/debian/kamera-trinity.install b/debian/_base/kdegraphics.automake/debian/kamera-trinity.install
index 16f11dbf2..16f11dbf2 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kamera-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kamera-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kcoloredit-trinity.install b/debian/_base/kdegraphics.automake/debian/kcoloredit-trinity.install
index 70f637e8d..70f637e8d 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kcoloredit-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kcoloredit-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kcoloredit-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kcoloredit-trinity.manpages
index e4673b667..e4673b667 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kcoloredit-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kcoloredit-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kcoloredit-trinity.menu b/debian/_base/kdegraphics.automake/debian/kcoloredit-trinity.menu
index a864f4fcb..a864f4fcb 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kcoloredit-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kcoloredit-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-dev-trinity.install b/debian/_base/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
index 3c15273ee..3c15273ee 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
index d59c53442..d59c53442 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
index 99b6d6e74..99b6d6e74 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
index bc08bb1a5..bc08bb1a5 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
index 4f714187e..4f714187e 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
index 60fb9060e..60fb9060e 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
index 92959c240..92959c240 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
index 1d1164d7b..1d1164d7b 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
index ddc5cde52..ddc5cde52 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
index ce0ad85f8..ce0ad85f8 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
index fa77c4a1c..fa77c4a1c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
index f6b3de6a3..f6b3de6a3 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
index 1518b4854..1518b4854 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
index e18e99ea0..e18e99ea0 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
index 018bcbe82..018bcbe82 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install b/debian/_base/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
index d7a77267e..d7a77267e 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdvi-trinity.install b/debian/_base/kdegraphics.automake/debian/kdvi-trinity.install
index 288ee8fed..288ee8fed 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdvi-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kdvi-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdvi-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kdvi-trinity.manpages
index 6cab6e597..6cab6e597 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdvi-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kdvi-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdvi-trinity.menu b/debian/_base/kdegraphics.automake/debian/kdvi-trinity.menu
index fd6a7d3be..fd6a7d3be 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdvi-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kdvi-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kdvi-trinity.mime b/debian/_base/kdegraphics.automake/debian/kdvi-trinity.mime
index 61bd2bb9b..61bd2bb9b 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kdvi-trinity.mime
+++ b/debian/_base/kdegraphics.automake/debian/kdvi-trinity.mime
diff --git a/debian/squeeze/kdegraphics.automake/debian/kfax-trinity.install b/debian/_base/kdegraphics.automake/debian/kfax-trinity.install
index 5c08ae3e5..5c08ae3e5 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kfax-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kfax-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kfax-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kfax-trinity.manpages
index 57b6c7961..57b6c7961 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kfax-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kfax-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kfax-trinity.menu b/debian/_base/kdegraphics.automake/debian/kfax-trinity.menu
index 3498fed01..3498fed01 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kfax-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kfax-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kfax-trinity.mime b/debian/_base/kdegraphics.automake/debian/kfax-trinity.mime
index e4aede21c..e4aede21c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kfax-trinity.mime
+++ b/debian/_base/kdegraphics.automake/debian/kfax-trinity.mime
diff --git a/debian/squeeze/kdegraphics.automake/debian/kfaxview-trinity.install b/debian/_base/kdegraphics.automake/debian/kfaxview-trinity.install
index 92000e53a..92000e53a 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kfaxview-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kfaxview-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kfaxview-trinity.lintian b/debian/_base/kdegraphics.automake/debian/kfaxview-trinity.lintian
index 7d86c17d3..7d86c17d3 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kfaxview-trinity.lintian
+++ b/debian/_base/kdegraphics.automake/debian/kfaxview-trinity.lintian
diff --git a/debian/squeeze/kdegraphics.automake/debian/kfaxview-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kfaxview-trinity.manpages
index a30d1c56a..a30d1c56a 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kfaxview-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kfaxview-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kfaxview-trinity.menu b/debian/_base/kdegraphics.automake/debian/kfaxview-trinity.menu
index 64550dfb4..64550dfb4 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kfaxview-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kfaxview-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kgamma-trinity.install b/debian/_base/kdegraphics.automake/debian/kgamma-trinity.install
index 4da99e829..4da99e829 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kgamma-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kgamma-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.install b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.install
index 8bb376a3c..8bb376a3c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.lintian b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.lintian
index 5bf0bd75c..5bf0bd75c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.lintian
+++ b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.lintian
diff --git a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.manpages
index 8cfcbdec7..8cfcbdec7 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.menu b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.menu
index 70467d3f7..70467d3f7 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.mime b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.mime
index b8894e89c..b8894e89c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kghostview-trinity.mime
+++ b/debian/_base/kdegraphics.automake/debian/kghostview-trinity.mime
diff --git a/debian/squeeze/kdegraphics.automake/debian/kiconedit-trinity.install b/debian/_base/kdegraphics.automake/debian/kiconedit-trinity.install
index ee15c189c..ee15c189c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kiconedit-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kiconedit-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kiconedit-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kiconedit-trinity.manpages
index 2f136ed6c..2f136ed6c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kiconedit-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kiconedit-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kiconedit-trinity.menu b/debian/_base/kdegraphics.automake/debian/kiconedit-trinity.menu
index 7add5c4f6..7add5c4f6 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kiconedit-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kiconedit-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kmrml-trinity.install b/debian/_base/kdegraphics.automake/debian/kmrml-trinity.install
index 99491c4e7..99491c4e7 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kmrml-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kmrml-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kmrml-trinity.lintian b/debian/_base/kdegraphics.automake/debian/kmrml-trinity.lintian
index 5c83f447b..5c83f447b 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kmrml-trinity.lintian
+++ b/debian/_base/kdegraphics.automake/debian/kmrml-trinity.lintian
diff --git a/debian/squeeze/kdegraphics.automake/debian/kolourpaint-trinity.install b/debian/_base/kdegraphics.automake/debian/kolourpaint-trinity.install
index d081a577f..d081a577f 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kolourpaint-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kolourpaint-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kolourpaint-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kolourpaint-trinity.manpages
index a10ddf05a..a10ddf05a 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kolourpaint-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kolourpaint-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kolourpaint-trinity.menu b/debian/_base/kdegraphics.automake/debian/kolourpaint-trinity.menu
index 4ae819ad3..4ae819ad3 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kolourpaint-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kolourpaint-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kooka-trinity.install b/debian/_base/kdegraphics.automake/debian/kooka-trinity.install
index 38d064424..38d064424 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kooka-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kooka-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kooka-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kooka-trinity.manpages
index 319f8652c..319f8652c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kooka-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kooka-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kooka-trinity.menu b/debian/_base/kdegraphics.automake/debian/kooka-trinity.menu
index a1c221081..a1c221081 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kooka-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kooka-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kpdf-trinity.install b/debian/_base/kdegraphics.automake/debian/kpdf-trinity.install
index 29584fa07..29584fa07 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kpdf-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kpdf-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kpdf-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kpdf-trinity.manpages
index 36f3caafb..36f3caafb 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kpdf-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kpdf-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kpdf-trinity.menu b/debian/_base/kdegraphics.automake/debian/kpdf-trinity.menu
index a9bf7aa0a..a9bf7aa0a 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kpdf-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kpdf-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kpdf-trinity.mime b/debian/_base/kdegraphics.automake/debian/kpdf-trinity.mime
index 7592a8adb..7592a8adb 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kpdf-trinity.mime
+++ b/debian/_base/kdegraphics.automake/debian/kpdf-trinity.mime
diff --git a/debian/squeeze/kdegraphics.automake/debian/kpovmodeler-trinity.install b/debian/_base/kdegraphics.automake/debian/kpovmodeler-trinity.install
index 84b6083ef..84b6083ef 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kpovmodeler-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kpovmodeler-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kpovmodeler-trinity.lintian b/debian/_base/kdegraphics.automake/debian/kpovmodeler-trinity.lintian
index 18443a699..18443a699 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kpovmodeler-trinity.lintian
+++ b/debian/_base/kdegraphics.automake/debian/kpovmodeler-trinity.lintian
diff --git a/debian/squeeze/kdegraphics.automake/debian/kpovmodeler-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kpovmodeler-trinity.manpages
index 11c1a16f8..11c1a16f8 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kpovmodeler-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kpovmodeler-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kpovmodeler-trinity.menu b/debian/_base/kdegraphics.automake/debian/kpovmodeler-trinity.menu
index 2ac1d39a7..2ac1d39a7 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kpovmodeler-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kpovmodeler-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kruler-trinity.install b/debian/_base/kdegraphics.automake/debian/kruler-trinity.install
index b39d5a2e0..b39d5a2e0 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kruler-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kruler-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kruler-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kruler-trinity.manpages
index aac20ba29..aac20ba29 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kruler-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kruler-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kruler-trinity.menu b/debian/_base/kdegraphics.automake/debian/kruler-trinity.menu
index b84cda933..b84cda933 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kruler-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kruler-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/ksnapshot-trinity.install b/debian/_base/kdegraphics.automake/debian/ksnapshot-trinity.install
index 460875310..460875310 100644
--- a/debian/squeeze/kdegraphics.automake/debian/ksnapshot-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/ksnapshot-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/ksnapshot-trinity.manpages b/debian/_base/kdegraphics.automake/debian/ksnapshot-trinity.manpages
index efb781eba..efb781eba 100644
--- a/debian/squeeze/kdegraphics.automake/debian/ksnapshot-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/ksnapshot-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/ksnapshot-trinity.menu b/debian/_base/kdegraphics.automake/debian/ksnapshot-trinity.menu
index 5939d5d61..5939d5d61 100644
--- a/debian/squeeze/kdegraphics.automake/debian/ksnapshot-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/ksnapshot-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/ksvg-trinity.install b/debian/_base/kdegraphics.automake/debian/ksvg-trinity.install
index e7264cbb8..e7264cbb8 100644
--- a/debian/squeeze/kdegraphics.automake/debian/ksvg-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/ksvg-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/ksvg-trinity.lintian b/debian/_base/kdegraphics.automake/debian/ksvg-trinity.lintian
index 9f56c22ee..9f56c22ee 100644
--- a/debian/squeeze/kdegraphics.automake/debian/ksvg-trinity.lintian
+++ b/debian/_base/kdegraphics.automake/debian/ksvg-trinity.lintian
diff --git a/debian/squeeze/kdegraphics.automake/debian/kuickshow-trinity.install b/debian/_base/kdegraphics.automake/debian/kuickshow-trinity.install
index 07929cfa2..07929cfa2 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kuickshow-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kuickshow-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kuickshow-trinity.lintian b/debian/_base/kdegraphics.automake/debian/kuickshow-trinity.lintian
index 61cb450ac..61cb450ac 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kuickshow-trinity.lintian
+++ b/debian/_base/kdegraphics.automake/debian/kuickshow-trinity.lintian
diff --git a/debian/squeeze/kdegraphics.automake/debian/kuickshow-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kuickshow-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kuickshow-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kuickshow-trinity.menu b/debian/_base/kdegraphics.automake/debian/kuickshow-trinity.menu
index 4075305dc..4075305dc 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kuickshow-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kuickshow-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.install b/debian/_base/kdegraphics.automake/debian/kview-trinity.install
index 0efbbd7b5..0efbbd7b5 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kview-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.lintian b/debian/_base/kdegraphics.automake/debian/kview-trinity.lintian
index 8314a8155..8314a8155 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.lintian
+++ b/debian/_base/kdegraphics.automake/debian/kview-trinity.lintian
diff --git a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kview-trinity.manpages
index bad8bf322..bad8bf322 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kview-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.menu b/debian/_base/kdegraphics.automake/debian/kview-trinity.menu
index e0779319d..e0779319d 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.menu
+++ b/debian/_base/kdegraphics.automake/debian/kview-trinity.menu
diff --git a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.mime b/debian/_base/kdegraphics.automake/debian/kview-trinity.mime
index 16e079720..16e079720 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kview-trinity.mime
+++ b/debian/_base/kdegraphics.automake/debian/kview-trinity.mime
diff --git a/debian/squeeze/kdegraphics.automake/debian/kviewshell-trinity.install b/debian/_base/kdegraphics.automake/debian/kviewshell-trinity.install
index 2d4ea669a..2d4ea669a 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kviewshell-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/kviewshell-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/kviewshell-trinity.lintian b/debian/_base/kdegraphics.automake/debian/kviewshell-trinity.lintian
index 4a0571207..4a0571207 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kviewshell-trinity.lintian
+++ b/debian/_base/kdegraphics.automake/debian/kviewshell-trinity.lintian
diff --git a/debian/squeeze/kdegraphics.automake/debian/kviewshell-trinity.manpages b/debian/_base/kdegraphics.automake/debian/kviewshell-trinity.manpages
index 89af3c5f2..89af3c5f2 100644
--- a/debian/squeeze/kdegraphics.automake/debian/kviewshell-trinity.manpages
+++ b/debian/_base/kdegraphics.automake/debian/kviewshell-trinity.manpages
diff --git a/debian/squeeze/kdegraphics.automake/debian/libkscan-dev-trinity.install b/debian/_base/kdegraphics.automake/debian/libkscan-dev-trinity.install
index 29764eb5d..29764eb5d 100644
--- a/debian/squeeze/kdegraphics.automake/debian/libkscan-dev-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/libkscan-dev-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/libkscan1-trinity.install b/debian/_base/kdegraphics.automake/debian/libkscan1-trinity.install
index 00674e14c..00674e14c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/libkscan1-trinity.install
+++ b/debian/_base/kdegraphics.automake/debian/libkscan1-trinity.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/libpoppler-tqt-dev.install b/debian/_base/kdegraphics.automake/debian/libpoppler-tqt-dev.install
index 57d9ec1d0..57d9ec1d0 100644
--- a/debian/squeeze/kdegraphics.automake/debian/libpoppler-tqt-dev.install
+++ b/debian/_base/kdegraphics.automake/debian/libpoppler-tqt-dev.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/libpoppler-tqt.install b/debian/_base/kdegraphics.automake/debian/libpoppler-tqt.install
index d63075962..d63075962 100644
--- a/debian/squeeze/kdegraphics.automake/debian/libpoppler-tqt.install
+++ b/debian/_base/kdegraphics.automake/debian/libpoppler-tqt.install
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kcolorchooser.1 b/debian/_base/kdegraphics.automake/debian/man/kcolorchooser.1
index e856c927c..e856c927c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kcolorchooser.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kcolorchooser.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kcoloredit.1 b/debian/_base/kdegraphics.automake/debian/man/kcoloredit.1
index 95807e3cd..95807e3cd 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kcoloredit.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kcoloredit.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kdvi.1 b/debian/_base/kdegraphics.automake/debian/man/kdvi.1
index 39bcbff11..39bcbff11 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kdvi.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kdvi.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kfax.1 b/debian/_base/kdegraphics.automake/debian/man/kfax.1
index 9d97915ff..9d97915ff 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kfax.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kfax.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kfaxview.1 b/debian/_base/kdegraphics.automake/debian/man/kfaxview.1
index 48dc9f74d..48dc9f74d 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kfaxview.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kfaxview.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kghostview.1 b/debian/_base/kdegraphics.automake/debian/man/kghostview.1
index a29a2c025..a29a2c025 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kghostview.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kghostview.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kiconedit.1 b/debian/_base/kdegraphics.automake/debian/man/kiconedit.1
index a91a5c1de..a91a5c1de 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kiconedit.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kiconedit.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kolourpaint.1 b/debian/_base/kdegraphics.automake/debian/man/kolourpaint.1
index 3a736b48c..3a736b48c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kolourpaint.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kolourpaint.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kooka.1 b/debian/_base/kdegraphics.automake/debian/man/kooka.1
index fc14a0984..fc14a0984 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kooka.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kooka.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kpdf.1 b/debian/_base/kdegraphics.automake/debian/man/kpdf.1
index 2b1ffaeeb..2b1ffaeeb 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kpdf.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kpdf.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kpovmodeler.1 b/debian/_base/kdegraphics.automake/debian/man/kpovmodeler.1
index ca14d57b8..ca14d57b8 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kpovmodeler.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kpovmodeler.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kruler.1 b/debian/_base/kdegraphics.automake/debian/man/kruler.1
index 617aef584..617aef584 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kruler.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kruler.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/ksnapshot.1 b/debian/_base/kdegraphics.automake/debian/man/ksnapshot.1
index abe516b09..abe516b09 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/ksnapshot.1
+++ b/debian/_base/kdegraphics.automake/debian/man/ksnapshot.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kuickshow.1 b/debian/_base/kdegraphics.automake/debian/man/kuickshow.1
index 2675eae4e..2675eae4e 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kuickshow.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kuickshow.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kview.1 b/debian/_base/kdegraphics.automake/debian/man/kview.1
index a506b7e20..a506b7e20 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kview.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kview.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/man/kviewshell.1 b/debian/_base/kdegraphics.automake/debian/man/kviewshell.1
index e9c762af2..e9c762af2 100644
--- a/debian/squeeze/kdegraphics.automake/debian/man/kviewshell.1
+++ b/debian/_base/kdegraphics.automake/debian/man/kviewshell.1
diff --git a/debian/squeeze/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdegraphics.automake/debian/rules b/debian/_base/kdegraphics.automake/debian/rules
index dc67d38f0..dc67d38f0 100755
--- a/debian/squeeze/kdegraphics.automake/debian/rules
+++ b/debian/_base/kdegraphics.automake/debian/rules
diff --git a/debian/squeeze/kdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
index b7d2adb39..b7d2adb39 100644
--- a/debian/squeeze/kdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdegraphics/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdegraphics/debian/cdbs/debian-qt-kde.mk
index 22a3fcf36..22a3fcf36 100644
--- a/debian/squeeze/kdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdegraphics/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdegraphics/debian/cdbs/kde.mk b/debian/_base/kdegraphics/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdegraphics/debian/cdbs/kde.mk
+++ b/debian/_base/kdegraphics/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdegraphics/debian/cdbs/versions.pl b/debian/_base/kdegraphics/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdegraphics/debian/cdbs/versions.pl
+++ b/debian/_base/kdegraphics/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdegraphics/debian/changelog b/debian/_base/kdegraphics/debian/changelog
index 38be59fe0..38be59fe0 100644
--- a/debian/squeeze/kdegraphics/debian/changelog
+++ b/debian/_base/kdegraphics/debian/changelog
diff --git a/debian/squeeze/kdegraphics/debian/compat b/debian/_base/kdegraphics/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdegraphics/debian/compat
+++ b/debian/_base/kdegraphics/debian/compat
diff --git a/debian/squeeze/kdegraphics/debian/control b/debian/_base/kdegraphics/debian/control
index 4a508e13b..4a508e13b 100644
--- a/debian/squeeze/kdegraphics/debian/control
+++ b/debian/_base/kdegraphics/debian/control
diff --git a/debian/squeeze/kdegraphics/debian/copyright b/debian/_base/kdegraphics/debian/copyright
index 13e809000..13e809000 100644
--- a/debian/squeeze/kdegraphics/debian/copyright
+++ b/debian/_base/kdegraphics/debian/copyright
diff --git a/debian/squeeze/kdegraphics/debian/icons/kcolorchooser-16.xpm b/debian/_base/kdegraphics/debian/icons/kcolorchooser-16.xpm
index 22a32da35..22a32da35 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kcolorchooser-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kcolorchooser-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kcolorchooser.xpm b/debian/_base/kdegraphics/debian/icons/kcolorchooser.xpm
index 22d830b4b..22d830b4b 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kcolorchooser.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kcolorchooser.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kcoloredit-16.xpm b/debian/_base/kdegraphics/debian/icons/kcoloredit-16.xpm
index 8e97bb914..8e97bb914 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kcoloredit-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kcoloredit-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kcoloredit.xpm b/debian/_base/kdegraphics/debian/icons/kcoloredit.xpm
index 83b310ff0..83b310ff0 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kcoloredit.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kcoloredit.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kdvi-16.xpm b/debian/_base/kdegraphics/debian/icons/kdvi-16.xpm
index db22767d4..db22767d4 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kdvi-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kdvi-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kdvi.xpm b/debian/_base/kdegraphics/debian/icons/kdvi.xpm
index fe4db5b6c..fe4db5b6c 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kdvi.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kdvi.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kfax-16.xpm b/debian/_base/kdegraphics/debian/icons/kfax-16.xpm
index 48804f8a5..48804f8a5 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kfax-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kfax-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kfax.xpm b/debian/_base/kdegraphics/debian/icons/kfax.xpm
index bd969b13a..bd969b13a 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kfax.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kfax.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kfaxview-16.xpm b/debian/_base/kdegraphics/debian/icons/kfaxview-16.xpm
index f5b699dcb..f5b699dcb 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kfaxview-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kfaxview-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kfaxview.xpm b/debian/_base/kdegraphics/debian/icons/kfaxview.xpm
index aea8354f4..aea8354f4 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kfaxview.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kfaxview.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kghostview-16.xpm b/debian/_base/kdegraphics/debian/icons/kghostview-16.xpm
index ccb9fa8ae..ccb9fa8ae 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kghostview-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kghostview-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kghostview.xpm b/debian/_base/kdegraphics/debian/icons/kghostview.xpm
index 38bb64331..38bb64331 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kghostview.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kghostview.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kiconedit-16.xpm b/debian/_base/kdegraphics/debian/icons/kiconedit-16.xpm
index 857f5fe1c..857f5fe1c 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kiconedit-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kiconedit-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kiconedit.xpm b/debian/_base/kdegraphics/debian/icons/kiconedit.xpm
index 412544858..412544858 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kiconedit.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kiconedit.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kolourpaint-16.xpm b/debian/_base/kdegraphics/debian/icons/kolourpaint-16.xpm
index 79cabaf05..79cabaf05 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kolourpaint-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kolourpaint-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kolourpaint.xpm b/debian/_base/kdegraphics/debian/icons/kolourpaint.xpm
index 32eba9310..32eba9310 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kolourpaint.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kolourpaint.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kooka-16.xpm b/debian/_base/kdegraphics/debian/icons/kooka-16.xpm
index 46cd10535..46cd10535 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kooka-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kooka-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kooka.xpm b/debian/_base/kdegraphics/debian/icons/kooka.xpm
index c720c7d21..c720c7d21 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kooka.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kooka.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kpdf-16.xpm b/debian/_base/kdegraphics/debian/icons/kpdf-16.xpm
index ce5082f88..ce5082f88 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kpdf-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kpdf-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kpdf.xpm b/debian/_base/kdegraphics/debian/icons/kpdf.xpm
index ae032c341..ae032c341 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kpdf.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kpdf.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kpovmodeler-16.xpm b/debian/_base/kdegraphics/debian/icons/kpovmodeler-16.xpm
index c25f014f0..c25f014f0 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kpovmodeler-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kpovmodeler-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kpovmodeler.xpm b/debian/_base/kdegraphics/debian/icons/kpovmodeler.xpm
index a998ccda9..a998ccda9 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kpovmodeler.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kpovmodeler.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kruler-16.xpm b/debian/_base/kdegraphics/debian/icons/kruler-16.xpm
index 3e5a27d03..3e5a27d03 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kruler-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kruler-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kruler.xpm b/debian/_base/kdegraphics/debian/icons/kruler.xpm
index 030fad1f5..030fad1f5 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kruler.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kruler.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/ksnapshot-16.xpm b/debian/_base/kdegraphics/debian/icons/ksnapshot-16.xpm
index f97cb30aa..f97cb30aa 100644
--- a/debian/squeeze/kdegraphics/debian/icons/ksnapshot-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/ksnapshot-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/ksnapshot.xpm b/debian/_base/kdegraphics/debian/icons/ksnapshot.xpm
index 302c59d25..302c59d25 100644
--- a/debian/squeeze/kdegraphics/debian/icons/ksnapshot.xpm
+++ b/debian/_base/kdegraphics/debian/icons/ksnapshot.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kuickshow-16.xpm b/debian/_base/kdegraphics/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kuickshow-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kuickshow-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kuickshow.xpm b/debian/_base/kdegraphics/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kuickshow.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kuickshow.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kview-16.xpm b/debian/_base/kdegraphics/debian/icons/kview-16.xpm
index 886c4821b..886c4821b 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kview-16.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kview-16.xpm
diff --git a/debian/squeeze/kdegraphics/debian/icons/kview.xpm b/debian/_base/kdegraphics/debian/icons/kview.xpm
index 606fc37e6..606fc37e6 100644
--- a/debian/squeeze/kdegraphics/debian/icons/kview.xpm
+++ b/debian/_base/kdegraphics/debian/icons/kview.xpm
diff --git a/debian/squeeze/kdegraphics/debian/kamera-trinity.install b/debian/_base/kdegraphics/debian/kamera-trinity.install
index d1955c8f0..d1955c8f0 100644
--- a/debian/squeeze/kdegraphics/debian/kamera-trinity.install
+++ b/debian/_base/kdegraphics/debian/kamera-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kcoloredit-trinity.install b/debian/_base/kdegraphics/debian/kcoloredit-trinity.install
index c63cb6a5e..c63cb6a5e 100644
--- a/debian/squeeze/kdegraphics/debian/kcoloredit-trinity.install
+++ b/debian/_base/kdegraphics/debian/kcoloredit-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kcoloredit-trinity.manpages b/debian/_base/kdegraphics/debian/kcoloredit-trinity.manpages
index e4673b667..e4673b667 100644
--- a/debian/squeeze/kdegraphics/debian/kcoloredit-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kcoloredit-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kcoloredit-trinity.menu b/debian/_base/kdegraphics/debian/kcoloredit-trinity.menu
index 16c26bf33..16c26bf33 100644
--- a/debian/squeeze/kdegraphics/debian/kcoloredit-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kcoloredit-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera
index 7909a26ea..7909a26ea 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit
index 0d401a846..0d401a846 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi
index 9f0bf4ab8..9f0bf4ab8 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma
index 2ce9d716f..2ce9d716f 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview
index e18d32a2a..e18d32a2a 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit
index 6e974fd53..6e974fd53 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint
index 7913d8654..7913d8654 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka
index d009db00c..d009db00c 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf
index 2060502d2..2060502d2 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler
index ea24b515e..ea24b515e 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler
index d86f6da8e..d86f6da8e 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot
index 97006ef6e..97006ef6e 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow
index fdb5baa20..fdb5baa20 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview
index 8824a84f5..8824a84f5 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview
+++ b/debian/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install b/debian/_base/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
index d7a77267e..d7a77267e 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
+++ b/debian/_base/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kdegraphics-trinity-dev.install b/debian/_base/kdegraphics/debian/kdegraphics-trinity-dev.install
index b22c37376..b22c37376 100644
--- a/debian/squeeze/kdegraphics/debian/kdegraphics-trinity-dev.install
+++ b/debian/_base/kdegraphics/debian/kdegraphics-trinity-dev.install
diff --git a/debian/squeeze/kdegraphics/debian/kdvi-trinity.install b/debian/_base/kdegraphics/debian/kdvi-trinity.install
index 1bdfcbd5e..1bdfcbd5e 100644
--- a/debian/squeeze/kdegraphics/debian/kdvi-trinity.install
+++ b/debian/_base/kdegraphics/debian/kdvi-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kdvi-trinity.manpages b/debian/_base/kdegraphics/debian/kdvi-trinity.manpages
index 6cab6e597..6cab6e597 100644
--- a/debian/squeeze/kdegraphics/debian/kdvi-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kdvi-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kdvi-trinity.menu b/debian/_base/kdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..ff4a21a01 100644
--- a/debian/squeeze/kdegraphics/debian/kdvi-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kdvi-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kdvi-trinity.mime b/debian/_base/kdegraphics/debian/kdvi-trinity.mime
index 61bd2bb9b..61bd2bb9b 100644
--- a/debian/squeeze/kdegraphics/debian/kdvi-trinity.mime
+++ b/debian/_base/kdegraphics/debian/kdvi-trinity.mime
diff --git a/debian/squeeze/kdegraphics/debian/kfax-trinity.install b/debian/_base/kdegraphics/debian/kfax-trinity.install
index 8ab8860d2..8ab8860d2 100644
--- a/debian/squeeze/kdegraphics/debian/kfax-trinity.install
+++ b/debian/_base/kdegraphics/debian/kfax-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kfax-trinity.manpages b/debian/_base/kdegraphics/debian/kfax-trinity.manpages
index 57b6c7961..57b6c7961 100644
--- a/debian/squeeze/kdegraphics/debian/kfax-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kfax-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kfax-trinity.menu b/debian/_base/kdegraphics/debian/kfax-trinity.menu
index e589bf6f6..e589bf6f6 100644
--- a/debian/squeeze/kdegraphics/debian/kfax-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kfax-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kfax-trinity.mime b/debian/_base/kdegraphics/debian/kfax-trinity.mime
index e4aede21c..e4aede21c 100644
--- a/debian/squeeze/kdegraphics/debian/kfax-trinity.mime
+++ b/debian/_base/kdegraphics/debian/kfax-trinity.mime
diff --git a/debian/squeeze/kdegraphics/debian/kfaxview-trinity.install b/debian/_base/kdegraphics/debian/kfaxview-trinity.install
index b82c77aa2..b82c77aa2 100644
--- a/debian/squeeze/kdegraphics/debian/kfaxview-trinity.install
+++ b/debian/_base/kdegraphics/debian/kfaxview-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kfaxview-trinity.lintian b/debian/_base/kdegraphics/debian/kfaxview-trinity.lintian
index 77a1b0e8e..77a1b0e8e 100644
--- a/debian/squeeze/kdegraphics/debian/kfaxview-trinity.lintian
+++ b/debian/_base/kdegraphics/debian/kfaxview-trinity.lintian
diff --git a/debian/squeeze/kdegraphics/debian/kfaxview-trinity.manpages b/debian/_base/kdegraphics/debian/kfaxview-trinity.manpages
index a30d1c56a..a30d1c56a 100644
--- a/debian/squeeze/kdegraphics/debian/kfaxview-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kfaxview-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kfaxview-trinity.menu b/debian/_base/kdegraphics/debian/kfaxview-trinity.menu
index ec47674cf..ec47674cf 100644
--- a/debian/squeeze/kdegraphics/debian/kfaxview-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kfaxview-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kgamma-trinity.install b/debian/_base/kdegraphics/debian/kgamma-trinity.install
index 4b4875ac9..4b4875ac9 100644
--- a/debian/squeeze/kdegraphics/debian/kgamma-trinity.install
+++ b/debian/_base/kdegraphics/debian/kgamma-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kghostview-trinity.install b/debian/_base/kdegraphics/debian/kghostview-trinity.install
index a464df646..a464df646 100644
--- a/debian/squeeze/kdegraphics/debian/kghostview-trinity.install
+++ b/debian/_base/kdegraphics/debian/kghostview-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kghostview-trinity.lintian b/debian/_base/kdegraphics/debian/kghostview-trinity.lintian
index 00a976862..00a976862 100644
--- a/debian/squeeze/kdegraphics/debian/kghostview-trinity.lintian
+++ b/debian/_base/kdegraphics/debian/kghostview-trinity.lintian
diff --git a/debian/squeeze/kdegraphics/debian/kghostview-trinity.manpages b/debian/_base/kdegraphics/debian/kghostview-trinity.manpages
index 8cfcbdec7..8cfcbdec7 100644
--- a/debian/squeeze/kdegraphics/debian/kghostview-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kghostview-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kghostview-trinity.menu b/debian/_base/kdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..b6398cbaf 100644
--- a/debian/squeeze/kdegraphics/debian/kghostview-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kghostview-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kghostview-trinity.mime b/debian/_base/kdegraphics/debian/kghostview-trinity.mime
index b8894e89c..b8894e89c 100644
--- a/debian/squeeze/kdegraphics/debian/kghostview-trinity.mime
+++ b/debian/_base/kdegraphics/debian/kghostview-trinity.mime
diff --git a/debian/squeeze/kdegraphics/debian/kiconedit-trinity.install b/debian/_base/kdegraphics/debian/kiconedit-trinity.install
index d4cf6ee97..d4cf6ee97 100644
--- a/debian/squeeze/kdegraphics/debian/kiconedit-trinity.install
+++ b/debian/_base/kdegraphics/debian/kiconedit-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kiconedit-trinity.manpages b/debian/_base/kdegraphics/debian/kiconedit-trinity.manpages
index 2f136ed6c..2f136ed6c 100644
--- a/debian/squeeze/kdegraphics/debian/kiconedit-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kiconedit-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kiconedit-trinity.menu b/debian/_base/kdegraphics/debian/kiconedit-trinity.menu
index 5c72f070f..5c72f070f 100644
--- a/debian/squeeze/kdegraphics/debian/kiconedit-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kiconedit-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kmrml-trinity.install b/debian/_base/kdegraphics/debian/kmrml-trinity.install
index 99491c4e7..99491c4e7 100644
--- a/debian/squeeze/kdegraphics/debian/kmrml-trinity.install
+++ b/debian/_base/kdegraphics/debian/kmrml-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kmrml-trinity.lintian b/debian/_base/kdegraphics/debian/kmrml-trinity.lintian
index 1e1c0f081..1e1c0f081 100644
--- a/debian/squeeze/kdegraphics/debian/kmrml-trinity.lintian
+++ b/debian/_base/kdegraphics/debian/kmrml-trinity.lintian
diff --git a/debian/squeeze/kdegraphics/debian/kolourpaint-trinity.install b/debian/_base/kdegraphics/debian/kolourpaint-trinity.install
index 0f256e00b..0f256e00b 100644
--- a/debian/squeeze/kdegraphics/debian/kolourpaint-trinity.install
+++ b/debian/_base/kdegraphics/debian/kolourpaint-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kolourpaint-trinity.manpages b/debian/_base/kdegraphics/debian/kolourpaint-trinity.manpages
index a10ddf05a..a10ddf05a 100644
--- a/debian/squeeze/kdegraphics/debian/kolourpaint-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kolourpaint-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kolourpaint-trinity.menu b/debian/_base/kdegraphics/debian/kolourpaint-trinity.menu
index 8af5a0655..8af5a0655 100644
--- a/debian/squeeze/kdegraphics/debian/kolourpaint-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kolourpaint-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kooka-trinity.install b/debian/_base/kdegraphics/debian/kooka-trinity.install
index d786c4b16..d786c4b16 100644
--- a/debian/squeeze/kdegraphics/debian/kooka-trinity.install
+++ b/debian/_base/kdegraphics/debian/kooka-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kooka-trinity.manpages b/debian/_base/kdegraphics/debian/kooka-trinity.manpages
index 319f8652c..319f8652c 100644
--- a/debian/squeeze/kdegraphics/debian/kooka-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kooka-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kooka-trinity.menu b/debian/_base/kdegraphics/debian/kooka-trinity.menu
index 5463d0e5b..5463d0e5b 100644
--- a/debian/squeeze/kdegraphics/debian/kooka-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kooka-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kpdf-trinity.install b/debian/_base/kdegraphics/debian/kpdf-trinity.install
index 0352f76ef..0352f76ef 100644
--- a/debian/squeeze/kdegraphics/debian/kpdf-trinity.install
+++ b/debian/_base/kdegraphics/debian/kpdf-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kpdf-trinity.manpages b/debian/_base/kdegraphics/debian/kpdf-trinity.manpages
index 36f3caafb..36f3caafb 100644
--- a/debian/squeeze/kdegraphics/debian/kpdf-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kpdf-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kpdf-trinity.menu b/debian/_base/kdegraphics/debian/kpdf-trinity.menu
index 2fb16ea91..2fb16ea91 100644
--- a/debian/squeeze/kdegraphics/debian/kpdf-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kpdf-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kpdf-trinity.mime b/debian/_base/kdegraphics/debian/kpdf-trinity.mime
index 7592a8adb..7592a8adb 100644
--- a/debian/squeeze/kdegraphics/debian/kpdf-trinity.mime
+++ b/debian/_base/kdegraphics/debian/kpdf-trinity.mime
diff --git a/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.install b/debian/_base/kdegraphics/debian/kpovmodeler-trinity.install
index 308070549..308070549 100644
--- a/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.install
+++ b/debian/_base/kdegraphics/debian/kpovmodeler-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.lintian b/debian/_base/kdegraphics/debian/kpovmodeler-trinity.lintian
index 354b0da93..354b0da93 100644
--- a/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/debian/_base/kdegraphics/debian/kpovmodeler-trinity.lintian
diff --git a/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.manpages b/debian/_base/kdegraphics/debian/kpovmodeler-trinity.manpages
index 11c1a16f8..11c1a16f8 100644
--- a/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kpovmodeler-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.menu b/debian/_base/kdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..5e1179c29 100644
--- a/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kpovmodeler-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kruler-trinity.install b/debian/_base/kdegraphics/debian/kruler-trinity.install
index d2e6878c0..d2e6878c0 100644
--- a/debian/squeeze/kdegraphics/debian/kruler-trinity.install
+++ b/debian/_base/kdegraphics/debian/kruler-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kruler-trinity.manpages b/debian/_base/kdegraphics/debian/kruler-trinity.manpages
index aac20ba29..aac20ba29 100644
--- a/debian/squeeze/kdegraphics/debian/kruler-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kruler-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kruler-trinity.menu b/debian/_base/kdegraphics/debian/kruler-trinity.menu
index 9daca2d6e..9daca2d6e 100644
--- a/debian/squeeze/kdegraphics/debian/kruler-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kruler-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/ksnapshot-trinity.install b/debian/_base/kdegraphics/debian/ksnapshot-trinity.install
index a159b7436..a159b7436 100644
--- a/debian/squeeze/kdegraphics/debian/ksnapshot-trinity.install
+++ b/debian/_base/kdegraphics/debian/ksnapshot-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/ksnapshot-trinity.manpages b/debian/_base/kdegraphics/debian/ksnapshot-trinity.manpages
index efb781eba..efb781eba 100644
--- a/debian/squeeze/kdegraphics/debian/ksnapshot-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/ksnapshot-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/ksnapshot-trinity.menu b/debian/_base/kdegraphics/debian/ksnapshot-trinity.menu
index e8edab9e2..e8edab9e2 100644
--- a/debian/squeeze/kdegraphics/debian/ksnapshot-trinity.menu
+++ b/debian/_base/kdegraphics/debian/ksnapshot-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/ksvg-trinity.install b/debian/_base/kdegraphics/debian/ksvg-trinity.install
index e7264cbb8..e7264cbb8 100644
--- a/debian/squeeze/kdegraphics/debian/ksvg-trinity.install
+++ b/debian/_base/kdegraphics/debian/ksvg-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/ksvg-trinity.lintian b/debian/_base/kdegraphics/debian/ksvg-trinity.lintian
index 64f139273..64f139273 100644
--- a/debian/squeeze/kdegraphics/debian/ksvg-trinity.lintian
+++ b/debian/_base/kdegraphics/debian/ksvg-trinity.lintian
diff --git a/debian/squeeze/kdegraphics/debian/kuickshow-trinity.install b/debian/_base/kdegraphics/debian/kuickshow-trinity.install
index d7909731b..d7909731b 100644
--- a/debian/squeeze/kdegraphics/debian/kuickshow-trinity.install
+++ b/debian/_base/kdegraphics/debian/kuickshow-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kuickshow-trinity.lintian b/debian/_base/kdegraphics/debian/kuickshow-trinity.lintian
index dd274dba5..dd274dba5 100644
--- a/debian/squeeze/kdegraphics/debian/kuickshow-trinity.lintian
+++ b/debian/_base/kdegraphics/debian/kuickshow-trinity.lintian
diff --git a/debian/squeeze/kdegraphics/debian/kuickshow-trinity.manpages b/debian/_base/kdegraphics/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/debian/squeeze/kdegraphics/debian/kuickshow-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kuickshow-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kuickshow-trinity.menu b/debian/_base/kdegraphics/debian/kuickshow-trinity.menu
index 7667ba6ee..7667ba6ee 100644
--- a/debian/squeeze/kdegraphics/debian/kuickshow-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kuickshow-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kview-trinity.install b/debian/_base/kdegraphics/debian/kview-trinity.install
index 0fcf823ab..0fcf823ab 100644
--- a/debian/squeeze/kdegraphics/debian/kview-trinity.install
+++ b/debian/_base/kdegraphics/debian/kview-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kview-trinity.lintian b/debian/_base/kdegraphics/debian/kview-trinity.lintian
index 7459b4b82..7459b4b82 100644
--- a/debian/squeeze/kdegraphics/debian/kview-trinity.lintian
+++ b/debian/_base/kdegraphics/debian/kview-trinity.lintian
diff --git a/debian/squeeze/kdegraphics/debian/kview-trinity.manpages b/debian/_base/kdegraphics/debian/kview-trinity.manpages
index bad8bf322..bad8bf322 100644
--- a/debian/squeeze/kdegraphics/debian/kview-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kview-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/kview-trinity.menu b/debian/_base/kdegraphics/debian/kview-trinity.menu
index b835f26fc..b835f26fc 100644
--- a/debian/squeeze/kdegraphics/debian/kview-trinity.menu
+++ b/debian/_base/kdegraphics/debian/kview-trinity.menu
diff --git a/debian/squeeze/kdegraphics/debian/kview-trinity.mime b/debian/_base/kdegraphics/debian/kview-trinity.mime
index 16e079720..16e079720 100644
--- a/debian/squeeze/kdegraphics/debian/kview-trinity.mime
+++ b/debian/_base/kdegraphics/debian/kview-trinity.mime
diff --git a/debian/squeeze/kdegraphics/debian/kviewshell-trinity.install b/debian/_base/kdegraphics/debian/kviewshell-trinity.install
index 2d4ea669a..2d4ea669a 100644
--- a/debian/squeeze/kdegraphics/debian/kviewshell-trinity.install
+++ b/debian/_base/kdegraphics/debian/kviewshell-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/kviewshell-trinity.lintian b/debian/_base/kdegraphics/debian/kviewshell-trinity.lintian
index 5e80c0a55..5e80c0a55 100644
--- a/debian/squeeze/kdegraphics/debian/kviewshell-trinity.lintian
+++ b/debian/_base/kdegraphics/debian/kviewshell-trinity.lintian
diff --git a/debian/squeeze/kdegraphics/debian/kviewshell-trinity.manpages b/debian/_base/kdegraphics/debian/kviewshell-trinity.manpages
index 89af3c5f2..89af3c5f2 100644
--- a/debian/squeeze/kdegraphics/debian/kviewshell-trinity.manpages
+++ b/debian/_base/kdegraphics/debian/kviewshell-trinity.manpages
diff --git a/debian/squeeze/kdegraphics/debian/libkscan-dev-trinity.install b/debian/_base/kdegraphics/debian/libkscan-dev-trinity.install
index 29764eb5d..29764eb5d 100644
--- a/debian/squeeze/kdegraphics/debian/libkscan-dev-trinity.install
+++ b/debian/_base/kdegraphics/debian/libkscan-dev-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/libkscan1-trinity.install b/debian/_base/kdegraphics/debian/libkscan1-trinity.install
index 00674e14c..00674e14c 100644
--- a/debian/squeeze/kdegraphics/debian/libkscan1-trinity.install
+++ b/debian/_base/kdegraphics/debian/libkscan1-trinity.install
diff --git a/debian/squeeze/kdegraphics/debian/libpoppler-tqt-dev.install b/debian/_base/kdegraphics/debian/libpoppler-tqt-dev.install
index f737043af..f737043af 100644
--- a/debian/squeeze/kdegraphics/debian/libpoppler-tqt-dev.install
+++ b/debian/_base/kdegraphics/debian/libpoppler-tqt-dev.install
diff --git a/debian/squeeze/kdegraphics/debian/libpoppler-tqt.install b/debian/_base/kdegraphics/debian/libpoppler-tqt.install
index d63075962..d63075962 100644
--- a/debian/squeeze/kdegraphics/debian/libpoppler-tqt.install
+++ b/debian/_base/kdegraphics/debian/libpoppler-tqt.install
diff --git a/debian/squeeze/kdegraphics/debian/man/kcolorchooser.1 b/debian/_base/kdegraphics/debian/man/kcolorchooser.1
index e856c927c..e856c927c 100644
--- a/debian/squeeze/kdegraphics/debian/man/kcolorchooser.1
+++ b/debian/_base/kdegraphics/debian/man/kcolorchooser.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kcoloredit.1 b/debian/_base/kdegraphics/debian/man/kcoloredit.1
index 95807e3cd..95807e3cd 100644
--- a/debian/squeeze/kdegraphics/debian/man/kcoloredit.1
+++ b/debian/_base/kdegraphics/debian/man/kcoloredit.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kdvi.1 b/debian/_base/kdegraphics/debian/man/kdvi.1
index 39bcbff11..39bcbff11 100644
--- a/debian/squeeze/kdegraphics/debian/man/kdvi.1
+++ b/debian/_base/kdegraphics/debian/man/kdvi.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kfax.1 b/debian/_base/kdegraphics/debian/man/kfax.1
index 9d97915ff..9d97915ff 100644
--- a/debian/squeeze/kdegraphics/debian/man/kfax.1
+++ b/debian/_base/kdegraphics/debian/man/kfax.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kfaxview.1 b/debian/_base/kdegraphics/debian/man/kfaxview.1
index 48dc9f74d..48dc9f74d 100644
--- a/debian/squeeze/kdegraphics/debian/man/kfaxview.1
+++ b/debian/_base/kdegraphics/debian/man/kfaxview.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kghostview.1 b/debian/_base/kdegraphics/debian/man/kghostview.1
index a29a2c025..a29a2c025 100644
--- a/debian/squeeze/kdegraphics/debian/man/kghostview.1
+++ b/debian/_base/kdegraphics/debian/man/kghostview.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kiconedit.1 b/debian/_base/kdegraphics/debian/man/kiconedit.1
index a91a5c1de..a91a5c1de 100644
--- a/debian/squeeze/kdegraphics/debian/man/kiconedit.1
+++ b/debian/_base/kdegraphics/debian/man/kiconedit.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kolourpaint.1 b/debian/_base/kdegraphics/debian/man/kolourpaint.1
index 3a736b48c..3a736b48c 100644
--- a/debian/squeeze/kdegraphics/debian/man/kolourpaint.1
+++ b/debian/_base/kdegraphics/debian/man/kolourpaint.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kooka.1 b/debian/_base/kdegraphics/debian/man/kooka.1
index fc14a0984..fc14a0984 100644
--- a/debian/squeeze/kdegraphics/debian/man/kooka.1
+++ b/debian/_base/kdegraphics/debian/man/kooka.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kpdf.1 b/debian/_base/kdegraphics/debian/man/kpdf.1
index 2b1ffaeeb..2b1ffaeeb 100644
--- a/debian/squeeze/kdegraphics/debian/man/kpdf.1
+++ b/debian/_base/kdegraphics/debian/man/kpdf.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kpovmodeler.1 b/debian/_base/kdegraphics/debian/man/kpovmodeler.1
index ca14d57b8..ca14d57b8 100644
--- a/debian/squeeze/kdegraphics/debian/man/kpovmodeler.1
+++ b/debian/_base/kdegraphics/debian/man/kpovmodeler.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kruler.1 b/debian/_base/kdegraphics/debian/man/kruler.1
index 617aef584..617aef584 100644
--- a/debian/squeeze/kdegraphics/debian/man/kruler.1
+++ b/debian/_base/kdegraphics/debian/man/kruler.1
diff --git a/debian/squeeze/kdegraphics/debian/man/ksnapshot.1 b/debian/_base/kdegraphics/debian/man/ksnapshot.1
index abe516b09..abe516b09 100644
--- a/debian/squeeze/kdegraphics/debian/man/ksnapshot.1
+++ b/debian/_base/kdegraphics/debian/man/ksnapshot.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kuickshow.1 b/debian/_base/kdegraphics/debian/man/kuickshow.1
index 2675eae4e..2675eae4e 100644
--- a/debian/squeeze/kdegraphics/debian/man/kuickshow.1
+++ b/debian/_base/kdegraphics/debian/man/kuickshow.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kview.1 b/debian/_base/kdegraphics/debian/man/kview.1
index a506b7e20..a506b7e20 100644
--- a/debian/squeeze/kdegraphics/debian/man/kview.1
+++ b/debian/_base/kdegraphics/debian/man/kview.1
diff --git a/debian/squeeze/kdegraphics/debian/man/kviewshell.1 b/debian/_base/kdegraphics/debian/man/kviewshell.1
index e9c762af2..e9c762af2 100644
--- a/debian/squeeze/kdegraphics/debian/man/kviewshell.1
+++ b/debian/_base/kdegraphics/debian/man/kviewshell.1
diff --git a/debian/squeeze/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdegraphics/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdegraphics/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdegraphics/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdegraphics/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdegraphics/debian/patches/series b/debian/_base/kdegraphics/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdegraphics/debian/patches/series
+++ b/debian/_base/kdegraphics/debian/patches/series
diff --git a/debian/squeeze/kdegraphics/debian/rules b/debian/_base/kdegraphics/debian/rules
index 3a69a6d97..3a69a6d97 100755
--- a/debian/squeeze/kdegraphics/debian/rules
+++ b/debian/_base/kdegraphics/debian/rules
diff --git a/debian/squeeze/kdegraphics/debian/source/format b/debian/_base/kdegraphics/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdegraphics/debian/source/format
+++ b/debian/_base/kdegraphics/debian/source/format
diff --git a/debian/squeeze/kdegraphics/debian/source/options b/debian/_base/kdegraphics/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdegraphics/debian/source/options
+++ b/debian/_base/kdegraphics/debian/source/options
diff --git a/debian/squeeze/kdelibs/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdelibs/debian/cdbs/debian-qt-kde.mk
index d29480355..d29480355 100644
--- a/debian/squeeze/kdelibs/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdelibs/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdelibs/debian/cdbs/kde.mk b/debian/_base/kdelibs/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdelibs/debian/cdbs/kde.mk
+++ b/debian/_base/kdelibs/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdelibs/debian/cdbs/versions.pl b/debian/_base/kdelibs/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdelibs/debian/cdbs/versions.pl
+++ b/debian/_base/kdelibs/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdelibs/debian/changelog b/debian/_base/kdelibs/debian/changelog
index 9ff272180..9ff272180 100644
--- a/debian/squeeze/kdelibs/debian/changelog
+++ b/debian/_base/kdelibs/debian/changelog
diff --git a/debian/squeeze/kdelibs/debian/compat b/debian/_base/kdelibs/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdelibs/debian/compat
+++ b/debian/_base/kdelibs/debian/compat
diff --git a/debian/squeeze/kdelibs/debian/control b/debian/_base/kdelibs/debian/control
index c600f508d..c600f508d 100644
--- a/debian/squeeze/kdelibs/debian/control
+++ b/debian/_base/kdelibs/debian/control
diff --git a/debian/squeeze/kdelibs/debian/copyright b/debian/_base/kdelibs/debian/copyright
index c622c0cf8..c622c0cf8 100644
--- a/debian/squeeze/kdelibs/debian/copyright
+++ b/debian/_base/kdelibs/debian/copyright
diff --git a/debian/squeeze/kdelibs/debian/icons/aboutkde-kubuntu.png.uu b/debian/_base/kdelibs/debian/icons/aboutkde-kubuntu.png.uu
index 9c8b56292..9c8b56292 100644
--- a/debian/squeeze/kdelibs/debian/icons/aboutkde-kubuntu.png.uu
+++ b/debian/_base/kdelibs/debian/icons/aboutkde-kubuntu.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr128-device-system.png.uu b/debian/_base/kdelibs/debian/icons/cr128-device-system.png.uu
index 325c64f04..325c64f04 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr128-device-system.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr128-device-system.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr16-action-hibernate.png.uu b/debian/_base/kdelibs/debian/icons/cr16-action-hibernate.png.uu
index 42b17fafe..42b17fafe 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr16-action-hibernate.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr16-action-hibernate.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr16-action-suspend.png.uu b/debian/_base/kdelibs/debian/icons/cr16-action-suspend.png.uu
index 75a91ef03..75a91ef03 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr16-action-suspend.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr16-action-suspend.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr16-device-system.png.uu b/debian/_base/kdelibs/debian/icons/cr16-device-system.png.uu
index 7c3e44164..7c3e44164 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr16-device-system.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr16-device-system.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr22-action-hibernate.png.uu b/debian/_base/kdelibs/debian/icons/cr22-action-hibernate.png.uu
index 567d6ee12..567d6ee12 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr22-action-hibernate.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr22-action-hibernate.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr22-action-suspend.png.uu b/debian/_base/kdelibs/debian/icons/cr22-action-suspend.png.uu
index 59147edcf..59147edcf 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr22-action-suspend.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr22-action-suspend.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr22-device-system.png.uu b/debian/_base/kdelibs/debian/icons/cr22-device-system.png.uu
index e8840ff4d..e8840ff4d 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr22-device-system.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr22-device-system.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr32-action-hibernate.png.uu b/debian/_base/kdelibs/debian/icons/cr32-action-hibernate.png.uu
index 7999fe293..7999fe293 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr32-action-hibernate.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr32-action-hibernate.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr32-action-suspend.png.uu b/debian/_base/kdelibs/debian/icons/cr32-action-suspend.png.uu
index 239f329fe..239f329fe 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr32-action-suspend.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr32-action-suspend.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr32-device-system.png.uu b/debian/_base/kdelibs/debian/icons/cr32-device-system.png.uu
index 4d4de6b7a..4d4de6b7a 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr32-device-system.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr32-device-system.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr48-action-hibernate.png.uu b/debian/_base/kdelibs/debian/icons/cr48-action-hibernate.png.uu
index 0cbac6155..0cbac6155 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr48-action-hibernate.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr48-action-hibernate.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr48-action-suspend.png.uu b/debian/_base/kdelibs/debian/icons/cr48-action-suspend.png.uu
index 7682a4e9f..7682a4e9f 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr48-action-suspend.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr48-action-suspend.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr48-device-system.png.uu b/debian/_base/kdelibs/debian/icons/cr48-device-system.png.uu
index e33e7324f..e33e7324f 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr48-device-system.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr48-device-system.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/cr64-device-system.png.uu b/debian/_base/kdelibs/debian/icons/cr64-device-system.png.uu
index b336ffede..b336ffede 100644
--- a/debian/squeeze/kdelibs/debian/icons/cr64-device-system.png.uu
+++ b/debian/_base/kdelibs/debian/icons/cr64-device-system.png.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/crsc-device-system.svgz.uu b/debian/_base/kdelibs/debian/icons/crsc-device-system.svgz.uu
index b8242b896..b8242b896 100644
--- a/debian/squeeze/kdelibs/debian/icons/crsc-device-system.svgz.uu
+++ b/debian/_base/kdelibs/debian/icons/crsc-device-system.svgz.uu
diff --git a/debian/squeeze/kdelibs/debian/icons/launchpad.png.uu b/debian/_base/kdelibs/debian/icons/launchpad.png.uu
index 854548828..854548828 100644
--- a/debian/squeeze/kdelibs/debian/icons/launchpad.png.uu
+++ b/debian/_base/kdelibs/debian/icons/launchpad.png.uu
diff --git a/debian/squeeze/kdelibs/debian/kcmshell b/debian/_base/kdelibs/debian/kcmshell
index 64dea7e87..64dea7e87 100755
--- a/debian/squeeze/kdelibs/debian/kcmshell
+++ b/debian/_base/kdelibs/debian/kcmshell
diff --git a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install b/debian/_base/kdelibs/debian/kdelibs-data-trinity.install
index 64ab8e4c8..64ab8e4c8 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install
+++ b/debian/_base/kdelibs/debian/kdelibs-data-trinity.install
diff --git a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.links b/debian/_base/kdelibs/debian/kdelibs-data-trinity.links
index 3b0f1cdf4..3b0f1cdf4 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.links
+++ b/debian/_base/kdelibs/debian/kdelibs-data-trinity.links
diff --git a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.postinst b/debian/_base/kdelibs/debian/kdelibs-data-trinity.postinst
index f2a8d925b..f2a8d925b 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.postinst
+++ b/debian/_base/kdelibs/debian/kdelibs-data-trinity.postinst
diff --git a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.postrm b/debian/_base/kdelibs/debian/kdelibs-data-trinity.postrm
index aae9f3600..aae9f3600 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.postrm
+++ b/debian/_base/kdelibs/debian/kdelibs-data-trinity.postrm
diff --git a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.preinst b/debian/_base/kdelibs/debian/kdelibs-data-trinity.preinst
index 452b17bfc..452b17bfc 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.preinst
+++ b/debian/_base/kdelibs/debian/kdelibs-data-trinity.preinst
diff --git a/debian/squeeze/kdelibs/debian/kdelibs-trinity.presubj b/debian/_base/kdelibs/debian/kdelibs-trinity.presubj
index d87db2dd4..d87db2dd4 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs-trinity.presubj
+++ b/debian/_base/kdelibs/debian/kdelibs-trinity.presubj
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.docs b/debian/_base/kdelibs/debian/kdelibs4-trinity-dev.docs
index 3d802584c..3d802584c 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.docs
+++ b/debian/_base/kdelibs/debian/kdelibs4-trinity-dev.docs
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.install b/debian/_base/kdelibs/debian/kdelibs4-trinity-dev.install
index 10607cdf8..10607cdf8 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.install
+++ b/debian/_base/kdelibs/debian/kdelibs4-trinity-dev.install
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.manpages b/debian/_base/kdelibs/debian/kdelibs4-trinity-dev.manpages
index af14a7e71..af14a7e71 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-dev.manpages
+++ b/debian/_base/kdelibs/debian/kdelibs4-trinity-dev.manpages
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-doc.install b/debian/_base/kdelibs/debian/kdelibs4-trinity-doc.install
index bbc48fffa..bbc48fffa 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4-trinity-doc.install
+++ b/debian/_base/kdelibs/debian/kdelibs4-trinity-doc.install
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.docs b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.docs
+++ b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.docs
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.install
index 4c8be8e62..4c8be8e62 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.install
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.lintian b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.lintian
index 7918aa780..7918aa780 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.lintian
+++ b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.lintian
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.manpages b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.manpages
index eba677adb..eba677adb 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.manpages
+++ b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.manpages
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.postinst b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.postinst
index 6dbf5d9e1..6dbf5d9e1 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.postinst
+++ b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.postinst
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.presubj b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.presubj
index d87db2dd4..d87db2dd4 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.presubj
+++ b/debian/_base/kdelibs/debian/kdelibs4c2a-trinity.presubj
diff --git a/debian/squeeze/kdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl b/debian/_base/kdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
index 1705e7d4f..1705e7d4f 100644
--- a/debian/squeeze/kdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
+++ b/debian/_base/kdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
diff --git a/debian/squeeze/kdelibs/debian/kubuntu-desktop-i18n/findfiles b/debian/_base/kdelibs/debian/kubuntu-desktop-i18n/findfiles
index 59a1d97a2..59a1d97a2 100644
--- a/debian/squeeze/kdelibs/debian/kubuntu-desktop-i18n/findfiles
+++ b/debian/_base/kdelibs/debian/kubuntu-desktop-i18n/findfiles
diff --git a/debian/squeeze/kdelibs/debian/kubuntu-desktop-i18n/msgsplit b/debian/_base/kdelibs/debian/kubuntu-desktop-i18n/msgsplit
index 98789a47f..98789a47f 100644
--- a/debian/squeeze/kdelibs/debian/kubuntu-desktop-i18n/msgsplit
+++ b/debian/_base/kdelibs/debian/kubuntu-desktop-i18n/msgsplit
diff --git a/debian/squeeze/kdelibs/debian/man/artsmessage-trinity.sgml b/debian/_base/kdelibs/debian/man/artsmessage-trinity.sgml
index 2d5d6dba8..2d5d6dba8 100644
--- a/debian/squeeze/kdelibs/debian/man/artsmessage-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/artsmessage-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/cupsdconf-trinity.sgml b/debian/_base/kdelibs/debian/man/cupsdconf-trinity.sgml
index 425b2e89b..425b2e89b 100644
--- a/debian/squeeze/kdelibs/debian/man/cupsdconf-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/cupsdconf-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/cupsdoprint-trinity.1 b/debian/_base/kdelibs/debian/man/cupsdoprint-trinity.1
index a79649057..a79649057 100644
--- a/debian/squeeze/kdelibs/debian/man/cupsdoprint-trinity.1
+++ b/debian/_base/kdelibs/debian/man/cupsdoprint-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/dcop-trinity.sgml b/debian/_base/kdelibs/debian/man/dcop-trinity.sgml
index 0c80c88a1..0c80c88a1 100644
--- a/debian/squeeze/kdelibs/debian/man/dcop-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/dcop-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/dcopclient-trinity.1 b/debian/_base/kdelibs/debian/man/dcopclient-trinity.1
index 911e0c0a4..911e0c0a4 100644
--- a/debian/squeeze/kdelibs/debian/man/dcopclient-trinity.1
+++ b/debian/_base/kdelibs/debian/man/dcopclient-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/dcopfind-trinity.sgml b/debian/_base/kdelibs/debian/man/dcopfind-trinity.sgml
index 5aeb03ce0..5aeb03ce0 100644
--- a/debian/squeeze/kdelibs/debian/man/dcopfind-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/dcopfind-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/dcopobject-trinity.1 b/debian/_base/kdelibs/debian/man/dcopobject-trinity.1
index 24ac94724..24ac94724 100644
--- a/debian/squeeze/kdelibs/debian/man/dcopobject-trinity.1
+++ b/debian/_base/kdelibs/debian/man/dcopobject-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/dcopquit-trinity.1 b/debian/_base/kdelibs/debian/man/dcopquit-trinity.1
index d9e967f22..d9e967f22 100644
--- a/debian/squeeze/kdelibs/debian/man/dcopquit-trinity.1
+++ b/debian/_base/kdelibs/debian/man/dcopquit-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/dcopref-trinity.1 b/debian/_base/kdelibs/debian/man/dcopref-trinity.1
index 1ebbe236e..1ebbe236e 100644
--- a/debian/squeeze/kdelibs/debian/man/dcopref-trinity.1
+++ b/debian/_base/kdelibs/debian/man/dcopref-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/dcopserver-trinity.sgml b/debian/_base/kdelibs/debian/man/dcopserver-trinity.sgml
index d58267994..d58267994 100644
--- a/debian/squeeze/kdelibs/debian/man/dcopserver-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/dcopserver-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/dcopserver_shutdown-trinity.1 b/debian/_base/kdelibs/debian/man/dcopserver_shutdown-trinity.1
index 51993a027..51993a027 100644
--- a/debian/squeeze/kdelibs/debian/man/dcopserver_shutdown-trinity.1
+++ b/debian/_base/kdelibs/debian/man/dcopserver_shutdown-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/dcopstart-trinity.sgml b/debian/_base/kdelibs/debian/man/dcopstart-trinity.sgml
index 48b0a050d..48b0a050d 100644
--- a/debian/squeeze/kdelibs/debian/man/dcopstart-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/dcopstart-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/fileshareset-trinity.1 b/debian/_base/kdelibs/debian/man/fileshareset-trinity.1
index 32cf55c8f..32cf55c8f 100644
--- a/debian/squeeze/kdelibs/debian/man/fileshareset-trinity.1
+++ b/debian/_base/kdelibs/debian/man/fileshareset-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/imagetops-trinity.1 b/debian/_base/kdelibs/debian/man/imagetops-trinity.1
index d169ae5d5..d169ae5d5 100644
--- a/debian/squeeze/kdelibs/debian/man/imagetops-trinity.1
+++ b/debian/_base/kdelibs/debian/man/imagetops-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kab2kabc-trinity.1 b/debian/_base/kdelibs/debian/man/kab2kabc-trinity.1
index cc7b69e98..cc7b69e98 100644
--- a/debian/squeeze/kdelibs/debian/man/kab2kabc-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kab2kabc-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kaddprinterwizard-trinity.sgml b/debian/_base/kdelibs/debian/man/kaddprinterwizard-trinity.sgml
index 4550e825c..4550e825c 100644
--- a/debian/squeeze/kdelibs/debian/man/kaddprinterwizard-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kaddprinterwizard-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kbuildsycoca-trinity.sgml b/debian/_base/kdelibs/debian/man/kbuildsycoca-trinity.sgml
index 92749d8ad..92749d8ad 100644
--- a/debian/squeeze/kdelibs/debian/man/kbuildsycoca-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kbuildsycoca-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kcmshell-trinity.1 b/debian/_base/kdelibs/debian/man/kcmshell-trinity.1
index f94a9a670..f94a9a670 100644
--- a/debian/squeeze/kdelibs/debian/man/kcmshell-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kcmshell-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kconf_update-trinity.sgml b/debian/_base/kdelibs/debian/man/kconf_update-trinity.sgml
index e7f29733a..e7f29733a 100644
--- a/debian/squeeze/kdelibs/debian/man/kconf_update-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kconf_update-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kconfig_compiler-trinity.1 b/debian/_base/kdelibs/debian/man/kconfig_compiler-trinity.1
index eab4596ed..eab4596ed 100644
--- a/debian/squeeze/kdelibs/debian/man/kconfig_compiler-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kconfig_compiler-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kcookiejar-trinity.sgml b/debian/_base/kdelibs/debian/man/kcookiejar-trinity.sgml
index 7cf48046f..7cf48046f 100644
--- a/debian/squeeze/kdelibs/debian/man/kcookiejar-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kcookiejar-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kde-config-trinity.sgml b/debian/_base/kdelibs/debian/man/kde-config-trinity.sgml
index 7be0ec30c..7be0ec30c 100644
--- a/debian/squeeze/kdelibs/debian/man/kde-config-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kde-config-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kde-menu-trinity.1 b/debian/_base/kdelibs/debian/man/kde-menu-trinity.1
index 29d6191f4..29d6191f4 100644
--- a/debian/squeeze/kdelibs/debian/man/kde-menu-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kde-menu-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kded-trinity.sgml b/debian/_base/kdelibs/debian/man/kded-trinity.sgml
index e14dc5c06..e14dc5c06 100644
--- a/debian/squeeze/kdelibs/debian/man/kded-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kded-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kdeinit-trinity.1 b/debian/_base/kdelibs/debian/man/kdeinit-trinity.1
index 1e1e10adf..1e1e10adf 100644
--- a/debian/squeeze/kdelibs/debian/man/kdeinit-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kdeinit-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kdeinit_shutdown-trinity.1 b/debian/_base/kdelibs/debian/man/kdeinit_shutdown-trinity.1
index 11081656a..11081656a 100644
--- a/debian/squeeze/kdelibs/debian/man/kdeinit_shutdown-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kdeinit_shutdown-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kdesu_stub-trinity.1 b/debian/_base/kdelibs/debian/man/kdesu_stub-trinity.1
index 7a3800513..7a3800513 100644
--- a/debian/squeeze/kdelibs/debian/man/kdesu_stub-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kdesu_stub-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kdontchangethehostname-trinity.sgml b/debian/_base/kdelibs/debian/man/kdontchangethehostname-trinity.sgml
index 4bb8117a7..4bb8117a7 100644
--- a/debian/squeeze/kdelibs/debian/man/kdontchangethehostname-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kdontchangethehostname-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kfile-trinity.sgml b/debian/_base/kdelibs/debian/man/kfile-trinity.sgml
index d5239142d..d5239142d 100644
--- a/debian/squeeze/kdelibs/debian/man/kfile-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kfile-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kgrantpty-trinity.1 b/debian/_base/kdelibs/debian/man/kgrantpty-trinity.1
index dba0cb67c..dba0cb67c 100644
--- a/debian/squeeze/kdelibs/debian/man/kgrantpty-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kgrantpty-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/khotnewstuff-trinity.1 b/debian/_base/kdelibs/debian/man/khotnewstuff-trinity.1
index 68421378d..68421378d 100644
--- a/debian/squeeze/kdelibs/debian/man/khotnewstuff-trinity.1
+++ b/debian/_base/kdelibs/debian/man/khotnewstuff-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kinstalltheme-trinity.sgml b/debian/_base/kdelibs/debian/man/kinstalltheme-trinity.sgml
index ba44a533f..ba44a533f 100644
--- a/debian/squeeze/kdelibs/debian/man/kinstalltheme-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kinstalltheme-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kio_http_cache_cleaner-trinity.sgml b/debian/_base/kdelibs/debian/man/kio_http_cache_cleaner-trinity.sgml
index d94156a3f..d94156a3f 100644
--- a/debian/squeeze/kdelibs/debian/man/kio_http_cache_cleaner-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kio_http_cache_cleaner-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kio_uiserver-trinity.sgml b/debian/_base/kdelibs/debian/man/kio_uiserver-trinity.sgml
index 753ca4f70..753ca4f70 100644
--- a/debian/squeeze/kdelibs/debian/man/kio_uiserver-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kio_uiserver-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kioexec-trinity.1 b/debian/_base/kdelibs/debian/man/kioexec-trinity.1
index d4e63ffad..d4e63ffad 100644
--- a/debian/squeeze/kdelibs/debian/man/kioexec-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kioexec-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/klauncher-trinity.1 b/debian/_base/kdelibs/debian/man/klauncher-trinity.1
index f8274aea6..f8274aea6 100644
--- a/debian/squeeze/kdelibs/debian/man/klauncher-trinity.1
+++ b/debian/_base/kdelibs/debian/man/klauncher-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kmailservice-trinity.sgml b/debian/_base/kdelibs/debian/man/kmailservice-trinity.sgml
index 506038dee..506038dee 100644
--- a/debian/squeeze/kdelibs/debian/man/kmailservice-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/kmailservice-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kpac_dhcp_helper-trinity.1 b/debian/_base/kdelibs/debian/man/kpac_dhcp_helper-trinity.1
index 3182b311a..3182b311a 100644
--- a/debian/squeeze/kdelibs/debian/man/kpac_dhcp_helper-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kpac_dhcp_helper-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/ksendbugmail-trinity.sgml b/debian/_base/kdelibs/debian/man/ksendbugmail-trinity.sgml
index 8276bf477..8276bf477 100644
--- a/debian/squeeze/kdelibs/debian/man/ksendbugmail-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/ksendbugmail-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/kshell-trinity.1 b/debian/_base/kdelibs/debian/man/kshell-trinity.1
index acbe215c8..acbe215c8 100644
--- a/debian/squeeze/kdelibs/debian/man/kshell-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kshell-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kstartupconfig-trinity.1 b/debian/_base/kdelibs/debian/man/kstartupconfig-trinity.1
index dca82fb5e..dca82fb5e 100644
--- a/debian/squeeze/kdelibs/debian/man/kstartupconfig-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kstartupconfig-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/ksvgtopng-trinity.1 b/debian/_base/kdelibs/debian/man/ksvgtopng-trinity.1
index ec5745095..ec5745095 100644
--- a/debian/squeeze/kdelibs/debian/man/ksvgtopng-trinity.1
+++ b/debian/_base/kdelibs/debian/man/ksvgtopng-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/ktelnetservice-trinity.sgml b/debian/_base/kdelibs/debian/man/ktelnetservice-trinity.sgml
index 3f1ceebdc..3f1ceebdc 100644
--- a/debian/squeeze/kdelibs/debian/man/ktelnetservice-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/ktelnetservice-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/ktradertest-trinity.1 b/debian/_base/kdelibs/debian/man/ktradertest-trinity.1
index 62c5521ad..62c5521ad 100644
--- a/debian/squeeze/kdelibs/debian/man/ktradertest-trinity.1
+++ b/debian/_base/kdelibs/debian/man/ktradertest-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/kunittestmodrunner-trinity.1 b/debian/_base/kdelibs/debian/man/kunittestmodrunner-trinity.1
index b61b06654..b61b06654 100644
--- a/debian/squeeze/kdelibs/debian/man/kunittestmodrunner-trinity.1
+++ b/debian/_base/kdelibs/debian/man/kunittestmodrunner-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/lnusertemp-trinity.sgml b/debian/_base/kdelibs/debian/man/lnusertemp-trinity.sgml
index c40c64520..c40c64520 100644
--- a/debian/squeeze/kdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/lnusertemp-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/make_driver_db_cups-trinity.1 b/debian/_base/kdelibs/debian/man/make_driver_db_cups-trinity.1
index e4eb8251f..e4eb8251f 100644
--- a/debian/squeeze/kdelibs/debian/man/make_driver_db_cups-trinity.1
+++ b/debian/_base/kdelibs/debian/man/make_driver_db_cups-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/make_driver_db_lpr-trinity.1 b/debian/_base/kdelibs/debian/man/make_driver_db_lpr-trinity.1
index 92708abae..92708abae 100644
--- a/debian/squeeze/kdelibs/debian/man/make_driver_db_lpr-trinity.1
+++ b/debian/_base/kdelibs/debian/man/make_driver_db_lpr-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/makekdewidgets-trinity.1 b/debian/_base/kdelibs/debian/man/makekdewidgets-trinity.1
index 1f91b9a4c..1f91b9a4c 100644
--- a/debian/squeeze/kdelibs/debian/man/makekdewidgets-trinity.1
+++ b/debian/_base/kdelibs/debian/man/makekdewidgets-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/man/meinproc-trinity.sgml b/debian/_base/kdelibs/debian/man/meinproc-trinity.sgml
index e1cb2bf03..e1cb2bf03 100644
--- a/debian/squeeze/kdelibs/debian/man/meinproc-trinity.sgml
+++ b/debian/_base/kdelibs/debian/man/meinproc-trinity.sgml
diff --git a/debian/squeeze/kdelibs/debian/man/preparetips-trinity.1 b/debian/_base/kdelibs/debian/man/preparetips-trinity.1
index 241444a40..241444a40 100644
--- a/debian/squeeze/kdelibs/debian/man/preparetips-trinity.1
+++ b/debian/_base/kdelibs/debian/man/preparetips-trinity.1
diff --git a/debian/squeeze/kdelibs/debian/not-installed.list b/debian/_base/kdelibs/debian/not-installed.list
index ad8dd66b4..ad8dd66b4 100644
--- a/debian/squeeze/kdelibs/debian/not-installed.list
+++ b/debian/_base/kdelibs/debian/not-installed.list
diff --git a/debian/squeeze/kdelibs/debian/patches/series b/debian/_base/kdelibs/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/kdelibs/debian/patches/series
+++ b/debian/_base/kdelibs/debian/patches/series
diff --git a/debian/squeeze/kdelibs/debian/prune-nonfree b/debian/_base/kdelibs/debian/prune-nonfree
index cb24b5db4..cb24b5db4 100644
--- a/debian/squeeze/kdelibs/debian/prune-nonfree
+++ b/debian/_base/kdelibs/debian/prune-nonfree
diff --git a/debian/squeeze/kdelibs/debian/rules b/debian/_base/kdelibs/debian/rules
index 8ef7a6ef4..8ef7a6ef4 100755
--- a/debian/squeeze/kdelibs/debian/rules
+++ b/debian/_base/kdelibs/debian/rules
diff --git a/debian/squeeze/kdelibs/debian/source/format b/debian/_base/kdelibs/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdelibs/debian/source/format
+++ b/debian/_base/kdelibs/debian/source/format
diff --git a/debian/squeeze/kdelibs/debian/source/options b/debian/_base/kdelibs/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdelibs/debian/source/options
+++ b/debian/_base/kdelibs/debian/source/options
diff --git a/debian/squeeze/kdelibs/debian/trinitylibs.conf b/debian/_base/kdelibs/debian/trinitylibs.conf
index 4158c0679..4158c0679 100644
--- a/debian/squeeze/kdelibs/debian/trinitylibs.conf
+++ b/debian/_base/kdelibs/debian/trinitylibs.conf
diff --git a/debian/squeeze/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES b/debian/_base/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
index b643a5ee2..b643a5ee2 100644
--- a/debian/squeeze/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/_base/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/debian/squeeze/kdemultimedia/debian/artsbuilder-trinity.install b/debian/_base/kdemultimedia/debian/artsbuilder-trinity.install
index b3f11c769..b3f11c769 100644
--- a/debian/squeeze/kdemultimedia/debian/artsbuilder-trinity.install
+++ b/debian/_base/kdemultimedia/debian/artsbuilder-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/artsbuilder-trinity.menu b/debian/_base/kdemultimedia/debian/artsbuilder-trinity.menu
index 8f8a1c989..8f8a1c989 100644
--- a/debian/squeeze/kdemultimedia/debian/artsbuilder-trinity.menu
+++ b/debian/_base/kdemultimedia/debian/artsbuilder-trinity.menu
diff --git a/debian/squeeze/kdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdemultimedia/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/debian/squeeze/kdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdemultimedia/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdemultimedia/debian/cdbs/kde.mk b/debian/_base/kdemultimedia/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdemultimedia/debian/cdbs/kde.mk
+++ b/debian/_base/kdemultimedia/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdemultimedia/debian/cdbs/versions.pl b/debian/_base/kdemultimedia/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdemultimedia/debian/cdbs/versions.pl
+++ b/debian/_base/kdemultimedia/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdemultimedia/debian/changelog b/debian/_base/kdemultimedia/debian/changelog
index b169a5838..b169a5838 100644
--- a/debian/squeeze/kdemultimedia/debian/changelog
+++ b/debian/_base/kdemultimedia/debian/changelog
diff --git a/debian/squeeze/kdemultimedia/debian/compat b/debian/_base/kdemultimedia/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdemultimedia/debian/compat
+++ b/debian/_base/kdemultimedia/debian/compat
diff --git a/debian/squeeze/kdemultimedia/debian/control b/debian/_base/kdemultimedia/debian/control
index b7d072232..b7d072232 100644
--- a/debian/squeeze/kdemultimedia/debian/control
+++ b/debian/_base/kdemultimedia/debian/control
diff --git a/debian/squeeze/kdemultimedia/debian/copyright b/debian/_base/kdemultimedia/debian/copyright
index 8957d914a..8957d914a 100644
--- a/debian/squeeze/kdemultimedia/debian/copyright
+++ b/debian/_base/kdemultimedia/debian/copyright
diff --git a/debian/squeeze/kdemultimedia/debian/icons/artsbuilder.xpm b/debian/_base/kdemultimedia/debian/icons/artsbuilder.xpm
index 8f5bd016b..8f5bd016b 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/artsbuilder.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/artsbuilder.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/artscontrol.xpm b/debian/_base/kdemultimedia/debian/icons/artscontrol.xpm
index b37b1e650..b37b1e650 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/artscontrol.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/artscontrol.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/juk-16.xpm b/debian/_base/kdemultimedia/debian/icons/juk-16.xpm
index 2b17c6068..2b17c6068 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/juk-16.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/juk-16.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/juk.xpm b/debian/_base/kdemultimedia/debian/icons/juk.xpm
index 30498a68b..30498a68b 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/juk.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/juk.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kaboodle-16.xpm b/debian/_base/kdemultimedia/debian/icons/kaboodle-16.xpm
index 4f4184dd1..4f4184dd1 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kaboodle-16.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kaboodle-16.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kaboodle.xpm b/debian/_base/kdemultimedia/debian/icons/kaboodle.xpm
index ab04a15f2..ab04a15f2 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kaboodle.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kaboodle.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kaudiocreator-16.xpm b/debian/_base/kdemultimedia/debian/icons/kaudiocreator-16.xpm
index 50b98352c..50b98352c 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kaudiocreator-16.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kaudiocreator-16.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kaudiocreator.xpm b/debian/_base/kdemultimedia/debian/icons/kaudiocreator.xpm
index 223436043..223436043 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kaudiocreator.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kaudiocreator.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kmid-16.xpm b/debian/_base/kdemultimedia/debian/icons/kmid-16.xpm
index 0a510090a..0a510090a 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kmid-16.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kmid-16.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kmid.xpm b/debian/_base/kdemultimedia/debian/icons/kmid.xpm
index fb669aa72..fb669aa72 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kmid.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kmid.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kmix-16.xpm b/debian/_base/kdemultimedia/debian/icons/kmix-16.xpm
index 58c2b675d..58c2b675d 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kmix-16.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kmix-16.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kmix.xpm b/debian/_base/kdemultimedia/debian/icons/kmix.xpm
index 0c04abfc8..0c04abfc8 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kmix.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kmix.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/krec-16.xpm b/debian/_base/kdemultimedia/debian/icons/krec-16.xpm
index 9db4ba58e..9db4ba58e 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/krec-16.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/krec-16.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/krec.xpm b/debian/_base/kdemultimedia/debian/icons/krec.xpm
index 108634685..108634685 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/krec.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/krec.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kscd-16.xpm b/debian/_base/kdemultimedia/debian/icons/kscd-16.xpm
index 8e279b754..8e279b754 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kscd-16.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kscd-16.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/kscd.xpm b/debian/_base/kdemultimedia/debian/icons/kscd.xpm
index b21878949..b21878949 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/kscd.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/kscd.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/noatun-16.xpm b/debian/_base/kdemultimedia/debian/icons/noatun-16.xpm
index fe4639857..fe4639857 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/noatun-16.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/noatun-16.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/icons/noatun.xpm b/debian/_base/kdemultimedia/debian/icons/noatun.xpm
index 10c085be5..10c085be5 100644
--- a/debian/squeeze/kdemultimedia/debian/icons/noatun.xpm
+++ b/debian/_base/kdemultimedia/debian/icons/noatun.xpm
diff --git a/debian/squeeze/kdemultimedia/debian/juk-trinity.install b/debian/_base/kdemultimedia/debian/juk-trinity.install
index 39ffc23e4..39ffc23e4 100644
--- a/debian/squeeze/kdemultimedia/debian/juk-trinity.install
+++ b/debian/_base/kdemultimedia/debian/juk-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/juk-trinity.manpages b/debian/_base/kdemultimedia/debian/juk-trinity.manpages
index cc1b91a74..cc1b91a74 100644
--- a/debian/squeeze/kdemultimedia/debian/juk-trinity.manpages
+++ b/debian/_base/kdemultimedia/debian/juk-trinity.manpages
diff --git a/debian/squeeze/kdemultimedia/debian/juk-trinity.menu b/debian/_base/kdemultimedia/debian/juk-trinity.menu
index b8af14259..b8af14259 100644
--- a/debian/squeeze/kdemultimedia/debian/juk-trinity.menu
+++ b/debian/_base/kdemultimedia/debian/juk-trinity.menu
diff --git a/debian/squeeze/kdemultimedia/debian/kaboodle-trinity.install b/debian/_base/kdemultimedia/debian/kaboodle-trinity.install
index dbf9019c1..dbf9019c1 100644
--- a/debian/squeeze/kdemultimedia/debian/kaboodle-trinity.install
+++ b/debian/_base/kdemultimedia/debian/kaboodle-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/kaboodle-trinity.manpages b/debian/_base/kdemultimedia/debian/kaboodle-trinity.manpages
index 56aa78551..56aa78551 100644
--- a/debian/squeeze/kdemultimedia/debian/kaboodle-trinity.manpages
+++ b/debian/_base/kdemultimedia/debian/kaboodle-trinity.manpages
diff --git a/debian/squeeze/kdemultimedia/debian/kaboodle-trinity.menu b/debian/_base/kdemultimedia/debian/kaboodle-trinity.menu
index 23e507270..23e507270 100644
--- a/debian/squeeze/kdemultimedia/debian/kaboodle-trinity.menu
+++ b/debian/_base/kdemultimedia/debian/kaboodle-trinity.menu
diff --git a/debian/squeeze/kdemultimedia/debian/kaudiocreator-trinity.install b/debian/_base/kdemultimedia/debian/kaudiocreator-trinity.install
index a21cdff62..a21cdff62 100644
--- a/debian/squeeze/kdemultimedia/debian/kaudiocreator-trinity.install
+++ b/debian/_base/kdemultimedia/debian/kaudiocreator-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/kaudiocreator-trinity.manpages b/debian/_base/kdemultimedia/debian/kaudiocreator-trinity.manpages
index e3f09d6dd..e3f09d6dd 100644
--- a/debian/squeeze/kdemultimedia/debian/kaudiocreator-trinity.manpages
+++ b/debian/_base/kdemultimedia/debian/kaudiocreator-trinity.manpages
diff --git a/debian/squeeze/kdemultimedia/debian/kaudiocreator-trinity.menu b/debian/_base/kdemultimedia/debian/kaudiocreator-trinity.menu
index 3dea45352..3dea45352 100644
--- a/debian/squeeze/kdemultimedia/debian/kaudiocreator-trinity.menu
+++ b/debian/_base/kdemultimedia/debian/kaudiocreator-trinity.menu
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder
index c661b6109..c661b6109 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk
index 7b5e13806..7b5e13806 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle
index 5082b485a..5082b485a 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid
index d704ec59a..d704ec59a 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix
index dfaa37564..dfaa37564 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec
index 74599736b..74599736b 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd
index 0bbe1bea0..0bbe1bea0 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun
index e93051e94..e93051e94 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install b/debian/_base/kdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install
index 26d0fa3c8..26d0fa3c8 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install b/debian/_base/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
index 422efd2a4..422efd2a4 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install b/debian/_base/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
index 9f7c1bd94..9f7c1bd94 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/kdemultimedia-trinity-dev.install b/debian/_base/kdemultimedia/debian/kdemultimedia-trinity-dev.install
index 343efda6f..343efda6f 100644
--- a/debian/squeeze/kdemultimedia/debian/kdemultimedia-trinity-dev.install
+++ b/debian/_base/kdemultimedia/debian/kdemultimedia-trinity-dev.install
diff --git a/debian/squeeze/kdemultimedia/debian/kmid-trinity.install b/debian/_base/kdemultimedia/debian/kmid-trinity.install
index 00d66fa05..00d66fa05 100644
--- a/debian/squeeze/kdemultimedia/debian/kmid-trinity.install
+++ b/debian/_base/kdemultimedia/debian/kmid-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/kmid-trinity.menu b/debian/_base/kdemultimedia/debian/kmid-trinity.menu
index 03e2ae87f..03e2ae87f 100644
--- a/debian/squeeze/kdemultimedia/debian/kmid-trinity.menu
+++ b/debian/_base/kdemultimedia/debian/kmid-trinity.menu
diff --git a/debian/squeeze/kdemultimedia/debian/kmix-trinity.install b/debian/_base/kdemultimedia/debian/kmix-trinity.install
index 61f017aa6..61f017aa6 100644
--- a/debian/squeeze/kdemultimedia/debian/kmix-trinity.install
+++ b/debian/_base/kdemultimedia/debian/kmix-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/kmix-trinity.lintian b/debian/_base/kdemultimedia/debian/kmix-trinity.lintian
index 8f1fe3f4e..8f1fe3f4e 100644
--- a/debian/squeeze/kdemultimedia/debian/kmix-trinity.lintian
+++ b/debian/_base/kdemultimedia/debian/kmix-trinity.lintian
diff --git a/debian/squeeze/kdemultimedia/debian/kmix-trinity.manpages b/debian/_base/kdemultimedia/debian/kmix-trinity.manpages
index e0adce8b6..e0adce8b6 100644
--- a/debian/squeeze/kdemultimedia/debian/kmix-trinity.manpages
+++ b/debian/_base/kdemultimedia/debian/kmix-trinity.manpages
diff --git a/debian/squeeze/kdemultimedia/debian/kmix-trinity.menu b/debian/_base/kdemultimedia/debian/kmix-trinity.menu
index 4f49f0f34..4f49f0f34 100644
--- a/debian/squeeze/kdemultimedia/debian/kmix-trinity.menu
+++ b/debian/_base/kdemultimedia/debian/kmix-trinity.menu
diff --git a/debian/squeeze/kdemultimedia/debian/krec-trinity.install b/debian/_base/kdemultimedia/debian/krec-trinity.install
index dd5a18756..dd5a18756 100644
--- a/debian/squeeze/kdemultimedia/debian/krec-trinity.install
+++ b/debian/_base/kdemultimedia/debian/krec-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/krec-trinity.lintian b/debian/_base/kdemultimedia/debian/krec-trinity.lintian
index b59ed3df8..b59ed3df8 100644
--- a/debian/squeeze/kdemultimedia/debian/krec-trinity.lintian
+++ b/debian/_base/kdemultimedia/debian/krec-trinity.lintian
diff --git a/debian/squeeze/kdemultimedia/debian/krec-trinity.manpages b/debian/_base/kdemultimedia/debian/krec-trinity.manpages
index 8a59c57a8..8a59c57a8 100644
--- a/debian/squeeze/kdemultimedia/debian/krec-trinity.manpages
+++ b/debian/_base/kdemultimedia/debian/krec-trinity.manpages
diff --git a/debian/squeeze/kdemultimedia/debian/krec-trinity.menu b/debian/_base/kdemultimedia/debian/krec-trinity.menu
index 4458fbd9b..4458fbd9b 100644
--- a/debian/squeeze/kdemultimedia/debian/krec-trinity.menu
+++ b/debian/_base/kdemultimedia/debian/krec-trinity.menu
diff --git a/debian/squeeze/kdemultimedia/debian/kscd-trinity.install b/debian/_base/kdemultimedia/debian/kscd-trinity.install
index f1e5b53d8..f1e5b53d8 100644
--- a/debian/squeeze/kdemultimedia/debian/kscd-trinity.install
+++ b/debian/_base/kdemultimedia/debian/kscd-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/kscd-trinity.menu b/debian/_base/kdemultimedia/debian/kscd-trinity.menu
index 20acd8291..20acd8291 100644
--- a/debian/squeeze/kdemultimedia/debian/kscd-trinity.menu
+++ b/debian/_base/kdemultimedia/debian/kscd-trinity.menu
diff --git a/debian/squeeze/kdemultimedia/debian/libarts1-akode-trinity.install b/debian/_base/kdemultimedia/debian/libarts1-akode-trinity.install
index 99a987715..99a987715 100644
--- a/debian/squeeze/kdemultimedia/debian/libarts1-akode-trinity.install
+++ b/debian/_base/kdemultimedia/debian/libarts1-akode-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/libarts1-audiofile-trinity.install b/debian/_base/kdemultimedia/debian/libarts1-audiofile-trinity.install
index cb2eba97a..cb2eba97a 100644
--- a/debian/squeeze/kdemultimedia/debian/libarts1-audiofile-trinity.install
+++ b/debian/_base/kdemultimedia/debian/libarts1-audiofile-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/libarts1-audiofile-trinity.lintian b/debian/_base/kdemultimedia/debian/libarts1-audiofile-trinity.lintian
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/kdemultimedia/debian/libarts1-audiofile-trinity.lintian
+++ b/debian/_base/kdemultimedia/debian/libarts1-audiofile-trinity.lintian
diff --git a/debian/squeeze/kdemultimedia/debian/libarts1-mpeglib-trinity.install b/debian/_base/kdemultimedia/debian/libarts1-mpeglib-trinity.install
index a4728ea10..a4728ea10 100644
--- a/debian/squeeze/kdemultimedia/debian/libarts1-mpeglib-trinity.install
+++ b/debian/_base/kdemultimedia/debian/libarts1-mpeglib-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/libarts1-xine-trinity.install b/debian/_base/kdemultimedia/debian/libarts1-xine-trinity.install
index ab89af340..ab89af340 100644
--- a/debian/squeeze/kdemultimedia/debian/libarts1-xine-trinity.install
+++ b/debian/_base/kdemultimedia/debian/libarts1-xine-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/libarts1-xine-trinity.lintian b/debian/_base/kdemultimedia/debian/libarts1-xine-trinity.lintian
index ef72447cf..ef72447cf 100644
--- a/debian/squeeze/kdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/debian/_base/kdemultimedia/debian/libarts1-xine-trinity.lintian
diff --git a/debian/squeeze/kdemultimedia/debian/libkcddb1-trinity.install b/debian/_base/kdemultimedia/debian/libkcddb1-trinity.install
index cece6d8da..cece6d8da 100644
--- a/debian/squeeze/kdemultimedia/debian/libkcddb1-trinity.install
+++ b/debian/_base/kdemultimedia/debian/libkcddb1-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/man/juk-trinity.1 b/debian/_base/kdemultimedia/debian/man/juk-trinity.1
index 040844523..040844523 100644
--- a/debian/squeeze/kdemultimedia/debian/man/juk-trinity.1
+++ b/debian/_base/kdemultimedia/debian/man/juk-trinity.1
diff --git a/debian/squeeze/kdemultimedia/debian/man/kaboodle-trinity.1 b/debian/_base/kdemultimedia/debian/man/kaboodle-trinity.1
index c7852c5db..c7852c5db 100644
--- a/debian/squeeze/kdemultimedia/debian/man/kaboodle-trinity.1
+++ b/debian/_base/kdemultimedia/debian/man/kaboodle-trinity.1
diff --git a/debian/squeeze/kdemultimedia/debian/man/kaudiocreator-trinity.1 b/debian/_base/kdemultimedia/debian/man/kaudiocreator-trinity.1
index 4e0fb9433..4e0fb9433 100644
--- a/debian/squeeze/kdemultimedia/debian/man/kaudiocreator-trinity.1
+++ b/debian/_base/kdemultimedia/debian/man/kaudiocreator-trinity.1
diff --git a/debian/squeeze/kdemultimedia/debian/man/kmix-trinity.1 b/debian/_base/kdemultimedia/debian/man/kmix-trinity.1
index a5b2607f2..a5b2607f2 100644
--- a/debian/squeeze/kdemultimedia/debian/man/kmix-trinity.1
+++ b/debian/_base/kdemultimedia/debian/man/kmix-trinity.1
diff --git a/debian/squeeze/kdemultimedia/debian/man/kmixctrl-trinity.1 b/debian/_base/kdemultimedia/debian/man/kmixctrl-trinity.1
index 8b4602809..8b4602809 100644
--- a/debian/squeeze/kdemultimedia/debian/man/kmixctrl-trinity.1
+++ b/debian/_base/kdemultimedia/debian/man/kmixctrl-trinity.1
diff --git a/debian/squeeze/kdemultimedia/debian/man/krec-trinity.1 b/debian/_base/kdemultimedia/debian/man/krec-trinity.1
index 7528c7d68..7528c7d68 100644
--- a/debian/squeeze/kdemultimedia/debian/man/krec-trinity.1
+++ b/debian/_base/kdemultimedia/debian/man/krec-trinity.1
diff --git a/debian/squeeze/kdemultimedia/debian/man/noatun-trinity.1 b/debian/_base/kdemultimedia/debian/man/noatun-trinity.1
index e1fecd54b..e1fecd54b 100644
--- a/debian/squeeze/kdemultimedia/debian/man/noatun-trinity.1
+++ b/debian/_base/kdemultimedia/debian/man/noatun-trinity.1
diff --git a/debian/squeeze/kdemultimedia/debian/mpeglib-trinity.install b/debian/_base/kdemultimedia/debian/mpeglib-trinity.install
index c1340ecff..c1340ecff 100644
--- a/debian/squeeze/kdemultimedia/debian/mpeglib-trinity.install
+++ b/debian/_base/kdemultimedia/debian/mpeglib-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/noatun-trinity.install b/debian/_base/kdemultimedia/debian/noatun-trinity.install
index a25312c66..a25312c66 100644
--- a/debian/squeeze/kdemultimedia/debian/noatun-trinity.install
+++ b/debian/_base/kdemultimedia/debian/noatun-trinity.install
diff --git a/debian/squeeze/kdemultimedia/debian/noatun-trinity.lintian b/debian/_base/kdemultimedia/debian/noatun-trinity.lintian
index 27214f531..27214f531 100644
--- a/debian/squeeze/kdemultimedia/debian/noatun-trinity.lintian
+++ b/debian/_base/kdemultimedia/debian/noatun-trinity.lintian
diff --git a/debian/squeeze/kdemultimedia/debian/noatun-trinity.manpages b/debian/_base/kdemultimedia/debian/noatun-trinity.manpages
index e5196f799..e5196f799 100644
--- a/debian/squeeze/kdemultimedia/debian/noatun-trinity.manpages
+++ b/debian/_base/kdemultimedia/debian/noatun-trinity.manpages
diff --git a/debian/squeeze/kdemultimedia/debian/noatun-trinity.menu b/debian/_base/kdemultimedia/debian/noatun-trinity.menu
index a79589ace..a79589ace 100644
--- a/debian/squeeze/kdemultimedia/debian/noatun-trinity.menu
+++ b/debian/_base/kdemultimedia/debian/noatun-trinity.menu
diff --git a/debian/squeeze/kdemultimedia/debian/noatun-trinity.mime b/debian/_base/kdemultimedia/debian/noatun-trinity.mime
index 4b757de3d..4b757de3d 100644
--- a/debian/squeeze/kdemultimedia/debian/noatun-trinity.mime
+++ b/debian/_base/kdemultimedia/debian/noatun-trinity.mime
diff --git a/debian/squeeze/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdemultimedia/debian/patches/series b/debian/_base/kdemultimedia/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdemultimedia/debian/patches/series
+++ b/debian/_base/kdemultimedia/debian/patches/series
diff --git a/debian/squeeze/kdemultimedia/debian/rules b/debian/_base/kdemultimedia/debian/rules
index c7bbdcd71..c7bbdcd71 100755
--- a/debian/squeeze/kdemultimedia/debian/rules
+++ b/debian/_base/kdemultimedia/debian/rules
diff --git a/debian/squeeze/kdemultimedia/debian/source/format b/debian/_base/kdemultimedia/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdemultimedia/debian/source/format
+++ b/debian/_base/kdemultimedia/debian/source/format
diff --git a/debian/squeeze/kdemultimedia/debian/source/options b/debian/_base/kdemultimedia/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdemultimedia/debian/source/options
+++ b/debian/_base/kdemultimedia/debian/source/options
diff --git a/debian/squeeze/kdenetwork/debian/KUBUNTU-DEBIAN-CHANGES b/debian/_base/kdenetwork/debian/KUBUNTU-DEBIAN-CHANGES
index fd40ff787..fd40ff787 100644
--- a/debian/squeeze/kdenetwork/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/_base/kdenetwork/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/debian/squeeze/kdenetwork/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdenetwork/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/debian/squeeze/kdenetwork/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdenetwork/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdenetwork/debian/cdbs/kde.mk b/debian/_base/kdenetwork/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/debian/squeeze/kdenetwork/debian/cdbs/kde.mk
+++ b/debian/_base/kdenetwork/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdenetwork/debian/cdbs/versions.pl b/debian/_base/kdenetwork/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdenetwork/debian/cdbs/versions.pl
+++ b/debian/_base/kdenetwork/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdenetwork/debian/changelog b/debian/_base/kdenetwork/debian/changelog
index f7b828757..f7b828757 100644
--- a/debian/squeeze/kdenetwork/debian/changelog
+++ b/debian/_base/kdenetwork/debian/changelog
diff --git a/debian/squeeze/kdenetwork/debian/compat b/debian/_base/kdenetwork/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdenetwork/debian/compat
+++ b/debian/_base/kdenetwork/debian/compat
diff --git a/debian/squeeze/kdenetwork/debian/control b/debian/_base/kdenetwork/debian/control
index 9d525f56e..9d525f56e 100644
--- a/debian/squeeze/kdenetwork/debian/control
+++ b/debian/_base/kdenetwork/debian/control
diff --git a/debian/squeeze/kdenetwork/debian/copyright b/debian/_base/kdenetwork/debian/copyright
index 810eb4b73..810eb4b73 100644
--- a/debian/squeeze/kdenetwork/debian/copyright
+++ b/debian/_base/kdenetwork/debian/copyright
diff --git a/debian/squeeze/kdenetwork/debian/dcoprss-trinity.install b/debian/_base/kdenetwork/debian/dcoprss-trinity.install
index a167af8da..a167af8da 100644
--- a/debian/squeeze/kdenetwork/debian/dcoprss-trinity.install
+++ b/debian/_base/kdenetwork/debian/dcoprss-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/icons/kdict-16.xpm b/debian/_base/kdenetwork/debian/icons/kdict-16.xpm
index 19fecc4ff..19fecc4ff 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kdict-16.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kdict-16.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/kdict.xpm b/debian/_base/kdenetwork/debian/icons/kdict.xpm
index d0efc5cd1..d0efc5cd1 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kdict.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kdict.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/kget-16.xpm b/debian/_base/kdenetwork/debian/icons/kget-16.xpm
index e51ad05d9..e51ad05d9 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kget-16.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kget-16.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/kget.xpm b/debian/_base/kdenetwork/debian/icons/kget.xpm
index 79ed2262b..79ed2262b 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kget.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kget.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/knewsticker-16.xpm b/debian/_base/kdenetwork/debian/icons/knewsticker-16.xpm
index aea3d8556..aea3d8556 100644
--- a/debian/squeeze/kdenetwork/debian/icons/knewsticker-16.xpm
+++ b/debian/_base/kdenetwork/debian/icons/knewsticker-16.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/knewsticker.xpm b/debian/_base/kdenetwork/debian/icons/knewsticker.xpm
index 05030698a..05030698a 100644
--- a/debian/squeeze/kdenetwork/debian/icons/knewsticker.xpm
+++ b/debian/_base/kdenetwork/debian/icons/knewsticker.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/kopete-16.xpm b/debian/_base/kdenetwork/debian/icons/kopete-16.xpm
index b9ccda679..b9ccda679 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kopete-16.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kopete-16.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/kopete.xpm b/debian/_base/kdenetwork/debian/icons/kopete.xpm
index e996e096c..e996e096c 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kopete.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kopete.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/kppp-16.xpm b/debian/_base/kdenetwork/debian/icons/kppp-16.xpm
index 4bff6468d..4bff6468d 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kppp-16.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kppp-16.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/kppp.xpm b/debian/_base/kdenetwork/debian/icons/kppp.xpm
index 59b7f6823..59b7f6823 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kppp.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kppp.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/krdc-16.xpm b/debian/_base/kdenetwork/debian/icons/krdc-16.xpm
index 0def168ad..0def168ad 100644
--- a/debian/squeeze/kdenetwork/debian/icons/krdc-16.xpm
+++ b/debian/_base/kdenetwork/debian/icons/krdc-16.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/krdc.xpm b/debian/_base/kdenetwork/debian/icons/krdc.xpm
index 4ec5687cc..4ec5687cc 100644
--- a/debian/squeeze/kdenetwork/debian/icons/krdc.xpm
+++ b/debian/_base/kdenetwork/debian/icons/krdc.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/krfb-16.xpm b/debian/_base/kdenetwork/debian/icons/krfb-16.xpm
index 469b0e91d..469b0e91d 100644
--- a/debian/squeeze/kdenetwork/debian/icons/krfb-16.xpm
+++ b/debian/_base/kdenetwork/debian/icons/krfb-16.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/krfb.xpm b/debian/_base/kdenetwork/debian/icons/krfb.xpm
index 99bdfb1a0..99bdfb1a0 100644
--- a/debian/squeeze/kdenetwork/debian/icons/krfb.xpm
+++ b/debian/_base/kdenetwork/debian/icons/krfb.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/ksirc-16.xpm b/debian/_base/kdenetwork/debian/icons/ksirc-16.xpm
index 3fdde4854..3fdde4854 100644
--- a/debian/squeeze/kdenetwork/debian/icons/ksirc-16.xpm
+++ b/debian/_base/kdenetwork/debian/icons/ksirc-16.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/ksirc.xpm b/debian/_base/kdenetwork/debian/icons/ksirc.xpm
index 0e52bbec6..0e52bbec6 100644
--- a/debian/squeeze/kdenetwork/debian/icons/ksirc.xpm
+++ b/debian/_base/kdenetwork/debian/icons/ksirc.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/kwifimanager-16.xpm b/debian/_base/kdenetwork/debian/icons/kwifimanager-16.xpm
index c2e8390ae..c2e8390ae 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kwifimanager-16.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kwifimanager-16.xpm
diff --git a/debian/squeeze/kdenetwork/debian/icons/kwifimanager.xpm b/debian/_base/kdenetwork/debian/icons/kwifimanager.xpm
index 8ed3c8790..8ed3c8790 100644
--- a/debian/squeeze/kdenetwork/debian/icons/kwifimanager.xpm
+++ b/debian/_base/kdenetwork/debian/icons/kwifimanager.xpm
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict
index 337a83b09..337a83b09 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget
index a200a52e0..a200a52e0 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker
index acdced484..acdced484 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete
index 87f02b01c..87f02b01c 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf
index cc148e6f8..cc148e6f8 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp
index 6ddfd1c40..6ddfd1c40 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc
index 2de27f79b..2de27f79b 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb
index 3d6eea1f8..3d6eea1f8 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc
index b09f4a4c4..b09f4a4c4 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd
index 92fa2c917..92fa2c917 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager
index af64e373a..af64e373a 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa
index aaeabfd4c..aaeabfd4c 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa
+++ b/debian/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-filesharing-trinity.install b/debian/_base/kdenetwork/debian/kdenetwork-filesharing-trinity.install
index 4b0e9f5b9..4b0e9f5b9 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-filesharing-trinity.install
+++ b/debian/_base/kdenetwork/debian/kdenetwork-filesharing-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install b/debian/_base/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
index b32a36440..b32a36440 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
+++ b/debian/_base/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/kdenetwork-trinity-dev.install b/debian/_base/kdenetwork/debian/kdenetwork-trinity-dev.install
index daec5ae7d..daec5ae7d 100644
--- a/debian/squeeze/kdenetwork/debian/kdenetwork-trinity-dev.install
+++ b/debian/_base/kdenetwork/debian/kdenetwork-trinity-dev.install
diff --git a/debian/squeeze/kdenetwork/debian/kdict-trinity.install b/debian/_base/kdenetwork/debian/kdict-trinity.install
index cc46f268b..cc46f268b 100644
--- a/debian/squeeze/kdenetwork/debian/kdict-trinity.install
+++ b/debian/_base/kdenetwork/debian/kdict-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/kdict-trinity.manpages b/debian/_base/kdenetwork/debian/kdict-trinity.manpages
index 3128a0e9a..3128a0e9a 100644
--- a/debian/squeeze/kdenetwork/debian/kdict-trinity.manpages
+++ b/debian/_base/kdenetwork/debian/kdict-trinity.manpages
diff --git a/debian/squeeze/kdenetwork/debian/kdict-trinity.menu b/debian/_base/kdenetwork/debian/kdict-trinity.menu
index 3bdad62c0..3bdad62c0 100644
--- a/debian/squeeze/kdenetwork/debian/kdict-trinity.menu
+++ b/debian/_base/kdenetwork/debian/kdict-trinity.menu
diff --git a/debian/squeeze/kdenetwork/debian/kdnssd-trinity.install b/debian/_base/kdenetwork/debian/kdnssd-trinity.install
index 8d6a52c6b..8d6a52c6b 100644
--- a/debian/squeeze/kdenetwork/debian/kdnssd-trinity.install
+++ b/debian/_base/kdenetwork/debian/kdnssd-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/kget-trinity.install b/debian/_base/kdenetwork/debian/kget-trinity.install
index 697f16e2e..697f16e2e 100644
--- a/debian/squeeze/kdenetwork/debian/kget-trinity.install
+++ b/debian/_base/kdenetwork/debian/kget-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/kget-trinity.manpages b/debian/_base/kdenetwork/debian/kget-trinity.manpages
index 585b03129..585b03129 100644
--- a/debian/squeeze/kdenetwork/debian/kget-trinity.manpages
+++ b/debian/_base/kdenetwork/debian/kget-trinity.manpages
diff --git a/debian/squeeze/kdenetwork/debian/kget-trinity.menu b/debian/_base/kdenetwork/debian/kget-trinity.menu
index 9f46d2ca2..9f46d2ca2 100644
--- a/debian/squeeze/kdenetwork/debian/kget-trinity.menu
+++ b/debian/_base/kdenetwork/debian/kget-trinity.menu
diff --git a/debian/squeeze/kdenetwork/debian/knewsticker-trinity.install b/debian/_base/kdenetwork/debian/knewsticker-trinity.install
index 11da896ac..11da896ac 100644
--- a/debian/squeeze/kdenetwork/debian/knewsticker-trinity.install
+++ b/debian/_base/kdenetwork/debian/knewsticker-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/knewsticker-trinity.lintian b/debian/_base/kdenetwork/debian/knewsticker-trinity.lintian
index 566329697..566329697 100644
--- a/debian/squeeze/kdenetwork/debian/knewsticker-trinity.lintian
+++ b/debian/_base/kdenetwork/debian/knewsticker-trinity.lintian
diff --git a/debian/squeeze/kdenetwork/debian/knewsticker-trinity.menu b/debian/_base/kdenetwork/debian/knewsticker-trinity.menu
index c8eb2dd48..c8eb2dd48 100644
--- a/debian/squeeze/kdenetwork/debian/knewsticker-trinity.menu
+++ b/debian/_base/kdenetwork/debian/knewsticker-trinity.menu
diff --git a/debian/squeeze/kdenetwork/debian/kopete-trinity.install b/debian/_base/kdenetwork/debian/kopete-trinity.install
index 1907c3fc0..1907c3fc0 100644
--- a/debian/squeeze/kdenetwork/debian/kopete-trinity.install
+++ b/debian/_base/kdenetwork/debian/kopete-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/kopete-trinity.manpages b/debian/_base/kdenetwork/debian/kopete-trinity.manpages
index 214a24d2e..214a24d2e 100644
--- a/debian/squeeze/kdenetwork/debian/kopete-trinity.manpages
+++ b/debian/_base/kdenetwork/debian/kopete-trinity.manpages
diff --git a/debian/squeeze/kdenetwork/debian/kopete-trinity.menu b/debian/_base/kdenetwork/debian/kopete-trinity.menu
index 4f809de8d..4f809de8d 100644
--- a/debian/squeeze/kdenetwork/debian/kopete-trinity.menu
+++ b/debian/_base/kdenetwork/debian/kopete-trinity.menu
diff --git a/debian/squeeze/kdenetwork/debian/kopete-trinity.postinst b/debian/_base/kdenetwork/debian/kopete-trinity.postinst
index 4ccb5ac4c..4ccb5ac4c 100644
--- a/debian/squeeze/kdenetwork/debian/kopete-trinity.postinst
+++ b/debian/_base/kdenetwork/debian/kopete-trinity.postinst
diff --git a/debian/squeeze/kdenetwork/debian/kopete-trinity.prerm b/debian/_base/kdenetwork/debian/kopete-trinity.prerm
index 4ee2b5d9d..4ee2b5d9d 100644
--- a/debian/squeeze/kdenetwork/debian/kopete-trinity.prerm
+++ b/debian/_base/kdenetwork/debian/kopete-trinity.prerm
diff --git a/debian/squeeze/kdenetwork/debian/kopete-trinity.presubj b/debian/_base/kdenetwork/debian/kopete-trinity.presubj
index d852c6c0d..d852c6c0d 100644
--- a/debian/squeeze/kdenetwork/debian/kopete-trinity.presubj
+++ b/debian/_base/kdenetwork/debian/kopete-trinity.presubj
diff --git a/debian/squeeze/kdenetwork/debian/kpf-trinity.install b/debian/_base/kdenetwork/debian/kpf-trinity.install
index 34db30cb4..34db30cb4 100644
--- a/debian/squeeze/kdenetwork/debian/kpf-trinity.install
+++ b/debian/_base/kdenetwork/debian/kpf-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/kppp-options b/debian/_base/kdenetwork/debian/kppp-options
index 32ec05f0e..32ec05f0e 100644
--- a/debian/squeeze/kdenetwork/debian/kppp-options
+++ b/debian/_base/kdenetwork/debian/kppp-options
diff --git a/debian/squeeze/kdenetwork/debian/kppp-trinity.README.Debian b/debian/_base/kdenetwork/debian/kppp-trinity.README.Debian
index 8602c6647..8602c6647 100644
--- a/debian/squeeze/kdenetwork/debian/kppp-trinity.README.Debian
+++ b/debian/_base/kdenetwork/debian/kppp-trinity.README.Debian
diff --git a/debian/squeeze/kdenetwork/debian/kppp-trinity.install b/debian/_base/kdenetwork/debian/kppp-trinity.install
index a62b64605..a62b64605 100644
--- a/debian/squeeze/kdenetwork/debian/kppp-trinity.install
+++ b/debian/_base/kdenetwork/debian/kppp-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/kppp-trinity.lintian b/debian/_base/kdenetwork/debian/kppp-trinity.lintian
index 5a3a22357..5a3a22357 100644
--- a/debian/squeeze/kdenetwork/debian/kppp-trinity.lintian
+++ b/debian/_base/kdenetwork/debian/kppp-trinity.lintian
diff --git a/debian/squeeze/kdenetwork/debian/kppp-trinity.menu b/debian/_base/kdenetwork/debian/kppp-trinity.menu
index 28837883b..28837883b 100644
--- a/debian/squeeze/kdenetwork/debian/kppp-trinity.menu
+++ b/debian/_base/kdenetwork/debian/kppp-trinity.menu
diff --git a/debian/squeeze/kdenetwork/debian/krdc-trinity.install b/debian/_base/kdenetwork/debian/krdc-trinity.install
index 9eae4f4c4..9eae4f4c4 100644
--- a/debian/squeeze/kdenetwork/debian/krdc-trinity.install
+++ b/debian/_base/kdenetwork/debian/krdc-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/krdc-trinity.menu b/debian/_base/kdenetwork/debian/krdc-trinity.menu
index 3f81d8ace..3f81d8ace 100644
--- a/debian/squeeze/kdenetwork/debian/krdc-trinity.menu
+++ b/debian/_base/kdenetwork/debian/krdc-trinity.menu
diff --git a/debian/squeeze/kdenetwork/debian/krfb-trinity.install b/debian/_base/kdenetwork/debian/krfb-trinity.install
index 8b7e8ce67..8b7e8ce67 100644
--- a/debian/squeeze/kdenetwork/debian/krfb-trinity.install
+++ b/debian/_base/kdenetwork/debian/krfb-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/krfb-trinity.menu b/debian/_base/kdenetwork/debian/krfb-trinity.menu
index 17114ebb0..17114ebb0 100644
--- a/debian/squeeze/kdenetwork/debian/krfb-trinity.menu
+++ b/debian/_base/kdenetwork/debian/krfb-trinity.menu
diff --git a/debian/squeeze/kdenetwork/debian/ksirc-trinity.install b/debian/_base/kdenetwork/debian/ksirc-trinity.install
index 73e4f9086..73e4f9086 100644
--- a/debian/squeeze/kdenetwork/debian/ksirc-trinity.install
+++ b/debian/_base/kdenetwork/debian/ksirc-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/ksirc-trinity.lintian b/debian/_base/kdenetwork/debian/ksirc-trinity.lintian
index 6256da4ce..6256da4ce 100644
--- a/debian/squeeze/kdenetwork/debian/ksirc-trinity.lintian
+++ b/debian/_base/kdenetwork/debian/ksirc-trinity.lintian
diff --git a/debian/squeeze/kdenetwork/debian/ksirc-trinity.menu b/debian/_base/kdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..7d0ac36b3 100644
--- a/debian/squeeze/kdenetwork/debian/ksirc-trinity.menu
+++ b/debian/_base/kdenetwork/debian/ksirc-trinity.menu
diff --git a/debian/squeeze/kdenetwork/debian/ktalkd-trinity.install b/debian/_base/kdenetwork/debian/ktalkd-trinity.install
index 607417afa..607417afa 100644
--- a/debian/squeeze/kdenetwork/debian/ktalkd-trinity.install
+++ b/debian/_base/kdenetwork/debian/ktalkd-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/ktalkd-trinity.postinst b/debian/_base/kdenetwork/debian/ktalkd-trinity.postinst
index 44dfd6c24..44dfd6c24 100644
--- a/debian/squeeze/kdenetwork/debian/ktalkd-trinity.postinst
+++ b/debian/_base/kdenetwork/debian/ktalkd-trinity.postinst
diff --git a/debian/squeeze/kdenetwork/debian/ktalkd-trinity.postrm b/debian/_base/kdenetwork/debian/ktalkd-trinity.postrm
index 6c2b34cdc..6c2b34cdc 100644
--- a/debian/squeeze/kdenetwork/debian/ktalkd-trinity.postrm
+++ b/debian/_base/kdenetwork/debian/ktalkd-trinity.postrm
diff --git a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.install b/debian/_base/kdenetwork/debian/kwifimanager-trinity.install
index b14b1c99b..b14b1c99b 100644
--- a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.install
+++ b/debian/_base/kdenetwork/debian/kwifimanager-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.lintian b/debian/_base/kdenetwork/debian/kwifimanager-trinity.lintian
index 1586f0f0a..1586f0f0a 100644
--- a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.lintian
+++ b/debian/_base/kdenetwork/debian/kwifimanager-trinity.lintian
diff --git a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.manpages b/debian/_base/kdenetwork/debian/kwifimanager-trinity.manpages
index 4f390510b..4f390510b 100644
--- a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.manpages
+++ b/debian/_base/kdenetwork/debian/kwifimanager-trinity.manpages
diff --git a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.menu b/debian/_base/kdenetwork/debian/kwifimanager-trinity.menu
index 8be926f6a..8be926f6a 100644
--- a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.menu
+++ b/debian/_base/kdenetwork/debian/kwifimanager-trinity.menu
diff --git a/debian/squeeze/kdenetwork/debian/librss1-trinity.install b/debian/_base/kdenetwork/debian/librss1-trinity.install
index d16201611..d16201611 100644
--- a/debian/squeeze/kdenetwork/debian/librss1-trinity.install
+++ b/debian/_base/kdenetwork/debian/librss1-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/lisa-trinity.docs b/debian/_base/kdenetwork/debian/lisa-trinity.docs
index 2a33a726f..2a33a726f 100644
--- a/debian/squeeze/kdenetwork/debian/lisa-trinity.docs
+++ b/debian/_base/kdenetwork/debian/lisa-trinity.docs
diff --git a/debian/squeeze/kdenetwork/debian/lisa-trinity.init b/debian/_base/kdenetwork/debian/lisa-trinity.init
index 4e5dfa113..4e5dfa113 100644
--- a/debian/squeeze/kdenetwork/debian/lisa-trinity.init
+++ b/debian/_base/kdenetwork/debian/lisa-trinity.init
diff --git a/debian/squeeze/kdenetwork/debian/lisa-trinity.install b/debian/_base/kdenetwork/debian/lisa-trinity.install
index 1a75e64db..1a75e64db 100644
--- a/debian/squeeze/kdenetwork/debian/lisa-trinity.install
+++ b/debian/_base/kdenetwork/debian/lisa-trinity.install
diff --git a/debian/squeeze/kdenetwork/debian/lisa-trinity.manpages b/debian/_base/kdenetwork/debian/lisa-trinity.manpages
index 306f0c52e..306f0c52e 100644
--- a/debian/squeeze/kdenetwork/debian/lisa-trinity.manpages
+++ b/debian/_base/kdenetwork/debian/lisa-trinity.manpages
diff --git a/debian/squeeze/kdenetwork/debian/lisarc b/debian/_base/kdenetwork/debian/lisarc
index 27a0c5f08..27a0c5f08 100644
--- a/debian/squeeze/kdenetwork/debian/lisarc
+++ b/debian/_base/kdenetwork/debian/lisarc
diff --git a/debian/squeeze/kdenetwork/debian/man/kdict-trinity.1 b/debian/_base/kdenetwork/debian/man/kdict-trinity.1
index 9c0b8daaa..9c0b8daaa 100644
--- a/debian/squeeze/kdenetwork/debian/man/kdict-trinity.1
+++ b/debian/_base/kdenetwork/debian/man/kdict-trinity.1
diff --git a/debian/squeeze/kdenetwork/debian/man/kget-trinity.1 b/debian/_base/kdenetwork/debian/man/kget-trinity.1
index acb34c941..acb34c941 100644
--- a/debian/squeeze/kdenetwork/debian/man/kget-trinity.1
+++ b/debian/_base/kdenetwork/debian/man/kget-trinity.1
diff --git a/debian/squeeze/kdenetwork/debian/man/kopete-trinity.sgml b/debian/_base/kdenetwork/debian/man/kopete-trinity.sgml
index e1bfb2900..e1bfb2900 100644
--- a/debian/squeeze/kdenetwork/debian/man/kopete-trinity.sgml
+++ b/debian/_base/kdenetwork/debian/man/kopete-trinity.sgml
diff --git a/debian/squeeze/kdenetwork/debian/man/kwifimanager-trinity.1 b/debian/_base/kdenetwork/debian/man/kwifimanager-trinity.1
index 11034e5aa..11034e5aa 100644
--- a/debian/squeeze/kdenetwork/debian/man/kwifimanager-trinity.1
+++ b/debian/_base/kdenetwork/debian/man/kwifimanager-trinity.1
diff --git a/debian/squeeze/kdenetwork/debian/man/lisa-trinity.8 b/debian/_base/kdenetwork/debian/man/lisa-trinity.8
index 9b3192e14..9b3192e14 100644
--- a/debian/squeeze/kdenetwork/debian/man/lisa-trinity.8
+++ b/debian/_base/kdenetwork/debian/man/lisa-trinity.8
diff --git a/debian/squeeze/kdenetwork/debian/man/reslisa-trinity.8 b/debian/_base/kdenetwork/debian/man/reslisa-trinity.8
index eb2ca8f48..eb2ca8f48 100644
--- a/debian/squeeze/kdenetwork/debian/man/reslisa-trinity.8
+++ b/debian/_base/kdenetwork/debian/man/reslisa-trinity.8
diff --git a/debian/squeeze/kdenetwork/debian/not-installed.list b/debian/_base/kdenetwork/debian/not-installed.list
index f73944ef7..f73944ef7 100644
--- a/debian/squeeze/kdenetwork/debian/not-installed.list
+++ b/debian/_base/kdenetwork/debian/not-installed.list
diff --git a/debian/squeeze/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdenetwork/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdenetwork/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdenetwork/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdenetwork/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdenetwork/debian/patches/series b/debian/_base/kdenetwork/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdenetwork/debian/patches/series
+++ b/debian/_base/kdenetwork/debian/patches/series
diff --git a/debian/squeeze/kdenetwork/debian/rules b/debian/_base/kdenetwork/debian/rules
index 1b8ccc627..1b8ccc627 100755
--- a/debian/squeeze/kdenetwork/debian/rules
+++ b/debian/_base/kdenetwork/debian/rules
diff --git a/debian/squeeze/kdenetwork/debian/source/format b/debian/_base/kdenetwork/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdenetwork/debian/source/format
+++ b/debian/_base/kdenetwork/debian/source/format
diff --git a/debian/squeeze/kdenetwork/debian/source/options b/debian/_base/kdenetwork/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdenetwork/debian/source/options
+++ b/debian/_base/kdenetwork/debian/source/options
diff --git a/debian/squeeze/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index a95d6a7aa..a95d6a7aa 100644
--- a/debian/squeeze/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdepim/debian/akregator-trinity.install b/debian/_base/kdepim/debian/akregator-trinity.install
index 456a67e27..456a67e27 100644
--- a/debian/squeeze/kdepim/debian/akregator-trinity.install
+++ b/debian/_base/kdepim/debian/akregator-trinity.install
diff --git a/debian/squeeze/kdepim/debian/akregator-trinity.manpages b/debian/_base/kdepim/debian/akregator-trinity.manpages
index 04a056c6e..04a056c6e 100644
--- a/debian/squeeze/kdepim/debian/akregator-trinity.manpages
+++ b/debian/_base/kdepim/debian/akregator-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/akregator-trinity.menu b/debian/_base/kdepim/debian/akregator-trinity.menu
index 5007b658f..5007b658f 100644
--- a/debian/squeeze/kdepim/debian/akregator-trinity.menu
+++ b/debian/_base/kdepim/debian/akregator-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/bits/fcntl.h b/debian/_base/kdepim/debian/bits/fcntl.h
index 342a533f1..342a533f1 100644
--- a/debian/squeeze/kdepim/debian/bits/fcntl.h
+++ b/debian/_base/kdepim/debian/bits/fcntl.h
diff --git a/debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdepim/debian/cdbs/debian-qt-kde.mk
index 3bd77b8f7..3bd77b8f7 100644
--- a/debian/squeeze/kdepim/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdepim/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdepim/debian/cdbs/kde.mk b/debian/_base/kdepim/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/debian/squeeze/kdepim/debian/cdbs/kde.mk
+++ b/debian/_base/kdepim/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdepim/debian/cdbs/versions.pl b/debian/_base/kdepim/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdepim/debian/cdbs/versions.pl
+++ b/debian/_base/kdepim/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdepim/debian/changelog b/debian/_base/kdepim/debian/changelog
index 07408b96b..07408b96b 100644
--- a/debian/squeeze/kdepim/debian/changelog
+++ b/debian/_base/kdepim/debian/changelog
diff --git a/debian/squeeze/kdepim/debian/compat b/debian/_base/kdepim/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdepim/debian/compat
+++ b/debian/_base/kdepim/debian/compat
diff --git a/debian/squeeze/kdepim/debian/control b/debian/_base/kdepim/debian/control
index 3a89e4b2e..3a89e4b2e 100644
--- a/debian/squeeze/kdepim/debian/control
+++ b/debian/_base/kdepim/debian/control
diff --git a/debian/squeeze/kdepim/debian/copyright b/debian/_base/kdepim/debian/copyright
index 708f6aa75..708f6aa75 100644
--- a/debian/squeeze/kdepim/debian/copyright
+++ b/debian/_base/kdepim/debian/copyright
diff --git a/debian/squeeze/kdepim/debian/icons/akregator-16.xpm b/debian/_base/kdepim/debian/icons/akregator-16.xpm
index 598317ae7..598317ae7 100644
--- a/debian/squeeze/kdepim/debian/icons/akregator-16.xpm
+++ b/debian/_base/kdepim/debian/icons/akregator-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/akregator.xpm b/debian/_base/kdepim/debian/icons/akregator.xpm
index aaa0b5fe8..aaa0b5fe8 100644
--- a/debian/squeeze/kdepim/debian/icons/akregator.xpm
+++ b/debian/_base/kdepim/debian/icons/akregator.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kaddressbook-16.xpm b/debian/_base/kdepim/debian/icons/kaddressbook-16.xpm
index 3ac635289..3ac635289 100644
--- a/debian/squeeze/kdepim/debian/icons/kaddressbook-16.xpm
+++ b/debian/_base/kdepim/debian/icons/kaddressbook-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kaddressbook.xpm b/debian/_base/kdepim/debian/icons/kaddressbook.xpm
index 337082f14..337082f14 100644
--- a/debian/squeeze/kdepim/debian/icons/kaddressbook.xpm
+++ b/debian/_base/kdepim/debian/icons/kaddressbook.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kalarm-16.xpm b/debian/_base/kdepim/debian/icons/kalarm-16.xpm
index 7ad36a097..7ad36a097 100644
--- a/debian/squeeze/kdepim/debian/icons/kalarm-16.xpm
+++ b/debian/_base/kdepim/debian/icons/kalarm-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kalarm.xpm b/debian/_base/kdepim/debian/icons/kalarm.xpm
index 0b1e62950..0b1e62950 100644
--- a/debian/squeeze/kdepim/debian/icons/kalarm.xpm
+++ b/debian/_base/kdepim/debian/icons/kalarm.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kandy-16.xpm b/debian/_base/kdepim/debian/icons/kandy-16.xpm
index 9d2361ce2..9d2361ce2 100644
--- a/debian/squeeze/kdepim/debian/icons/kandy-16.xpm
+++ b/debian/_base/kdepim/debian/icons/kandy-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kandy.xpm b/debian/_base/kdepim/debian/icons/kandy.xpm
index 78fc91d9a..78fc91d9a 100644
--- a/debian/squeeze/kdepim/debian/icons/kandy.xpm
+++ b/debian/_base/kdepim/debian/icons/kandy.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/karm-16.xpm b/debian/_base/kdepim/debian/icons/karm-16.xpm
index cddfe0e76..cddfe0e76 100644
--- a/debian/squeeze/kdepim/debian/icons/karm-16.xpm
+++ b/debian/_base/kdepim/debian/icons/karm-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/karm.xpm b/debian/_base/kdepim/debian/icons/karm.xpm
index 38f832c9a..38f832c9a 100644
--- a/debian/squeeze/kdepim/debian/icons/karm.xpm
+++ b/debian/_base/kdepim/debian/icons/karm.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kmail-16.xpm b/debian/_base/kdepim/debian/icons/kmail-16.xpm
index a387d347f..a387d347f 100644
--- a/debian/squeeze/kdepim/debian/icons/kmail-16.xpm
+++ b/debian/_base/kdepim/debian/icons/kmail-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kmail.xpm b/debian/_base/kdepim/debian/icons/kmail.xpm
index dc0d1a689..dc0d1a689 100644
--- a/debian/squeeze/kdepim/debian/icons/kmail.xpm
+++ b/debian/_base/kdepim/debian/icons/kmail.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kmailcvt-16.xpm b/debian/_base/kdepim/debian/icons/kmailcvt-16.xpm
index 1ab4abd6c..1ab4abd6c 100644
--- a/debian/squeeze/kdepim/debian/icons/kmailcvt-16.xpm
+++ b/debian/_base/kdepim/debian/icons/kmailcvt-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kmailcvt.xpm b/debian/_base/kdepim/debian/icons/kmailcvt.xpm
index 25da3a69a..25da3a69a 100644
--- a/debian/squeeze/kdepim/debian/icons/kmailcvt.xpm
+++ b/debian/_base/kdepim/debian/icons/kmailcvt.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/knode-16.xpm b/debian/_base/kdepim/debian/icons/knode-16.xpm
index 60516c0d6..60516c0d6 100644
--- a/debian/squeeze/kdepim/debian/icons/knode-16.xpm
+++ b/debian/_base/kdepim/debian/icons/knode-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/knode.xpm b/debian/_base/kdepim/debian/icons/knode.xpm
index b0e8361ad..b0e8361ad 100644
--- a/debian/squeeze/kdepim/debian/icons/knode.xpm
+++ b/debian/_base/kdepim/debian/icons/knode.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/knotes-16.xpm b/debian/_base/kdepim/debian/icons/knotes-16.xpm
index 0daa3ecfa..0daa3ecfa 100644
--- a/debian/squeeze/kdepim/debian/icons/knotes-16.xpm
+++ b/debian/_base/kdepim/debian/icons/knotes-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/knotes.xpm b/debian/_base/kdepim/debian/icons/knotes.xpm
index 8c96be652..8c96be652 100644
--- a/debian/squeeze/kdepim/debian/icons/knotes.xpm
+++ b/debian/_base/kdepim/debian/icons/knotes.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kontact-16.xpm b/debian/_base/kdepim/debian/icons/kontact-16.xpm
index 4332e2cc0..4332e2cc0 100644
--- a/debian/squeeze/kdepim/debian/icons/kontact-16.xpm
+++ b/debian/_base/kdepim/debian/icons/kontact-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kontact.xpm b/debian/_base/kdepim/debian/icons/kontact.xpm
index 1b5e038b5..1b5e038b5 100644
--- a/debian/squeeze/kdepim/debian/icons/kontact.xpm
+++ b/debian/_base/kdepim/debian/icons/kontact.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/korganizer-16.xpm b/debian/_base/kdepim/debian/icons/korganizer-16.xpm
index 5bba2637c..5bba2637c 100644
--- a/debian/squeeze/kdepim/debian/icons/korganizer-16.xpm
+++ b/debian/_base/kdepim/debian/icons/korganizer-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/korganizer.xpm b/debian/_base/kdepim/debian/icons/korganizer.xpm
index 66693bfbb..66693bfbb 100644
--- a/debian/squeeze/kdepim/debian/icons/korganizer.xpm
+++ b/debian/_base/kdepim/debian/icons/korganizer.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/korn-16.xpm b/debian/_base/kdepim/debian/icons/korn-16.xpm
index 33f993fb2..33f993fb2 100644
--- a/debian/squeeze/kdepim/debian/icons/korn-16.xpm
+++ b/debian/_base/kdepim/debian/icons/korn-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/korn.xpm b/debian/_base/kdepim/debian/icons/korn.xpm
index cb518223e..cb518223e 100644
--- a/debian/squeeze/kdepim/debian/icons/korn.xpm
+++ b/debian/_base/kdepim/debian/icons/korn.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kpalmdoc-16.xpm b/debian/_base/kdepim/debian/icons/kpalmdoc-16.xpm
index 714032360..714032360 100644
--- a/debian/squeeze/kdepim/debian/icons/kpalmdoc-16.xpm
+++ b/debian/_base/kdepim/debian/icons/kpalmdoc-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kpalmdoc.xpm b/debian/_base/kdepim/debian/icons/kpalmdoc.xpm
index 02521e56f..02521e56f 100644
--- a/debian/squeeze/kdepim/debian/icons/kpalmdoc.xpm
+++ b/debian/_base/kdepim/debian/icons/kpalmdoc.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kpilot-16.xpm b/debian/_base/kdepim/debian/icons/kpilot-16.xpm
index 25fe904f2..25fe904f2 100644
--- a/debian/squeeze/kdepim/debian/icons/kpilot-16.xpm
+++ b/debian/_base/kdepim/debian/icons/kpilot-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/kpilot.xpm b/debian/_base/kdepim/debian/icons/kpilot.xpm
index b4f7a7aa0..b4f7a7aa0 100644
--- a/debian/squeeze/kdepim/debian/icons/kpilot.xpm
+++ b/debian/_base/kdepim/debian/icons/kpilot.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/ksync-16.xpm b/debian/_base/kdepim/debian/icons/ksync-16.xpm
index 46518a787..46518a787 100644
--- a/debian/squeeze/kdepim/debian/icons/ksync-16.xpm
+++ b/debian/_base/kdepim/debian/icons/ksync-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/ksync.xpm b/debian/_base/kdepim/debian/icons/ksync.xpm
index cb7727237..cb7727237 100644
--- a/debian/squeeze/kdepim/debian/icons/ksync.xpm
+++ b/debian/_base/kdepim/debian/icons/ksync.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/ktnef-16.xpm b/debian/_base/kdepim/debian/icons/ktnef-16.xpm
index a387d347f..a387d347f 100644
--- a/debian/squeeze/kdepim/debian/icons/ktnef-16.xpm
+++ b/debian/_base/kdepim/debian/icons/ktnef-16.xpm
diff --git a/debian/squeeze/kdepim/debian/icons/ktnef.xpm b/debian/_base/kdepim/debian/icons/ktnef.xpm
index dc0d1a689..dc0d1a689 100644
--- a/debian/squeeze/kdepim/debian/icons/ktnef.xpm
+++ b/debian/_base/kdepim/debian/icons/ktnef.xpm
diff --git a/debian/squeeze/kdepim/debian/kaddressbook-trinity.install b/debian/_base/kdepim/debian/kaddressbook-trinity.install
index ce026e81a..ce026e81a 100644
--- a/debian/squeeze/kdepim/debian/kaddressbook-trinity.install
+++ b/debian/_base/kdepim/debian/kaddressbook-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kaddressbook-trinity.links b/debian/_base/kdepim/debian/kaddressbook-trinity.links
index 8a98675cc..8a98675cc 100644
--- a/debian/squeeze/kdepim/debian/kaddressbook-trinity.links
+++ b/debian/_base/kdepim/debian/kaddressbook-trinity.links
diff --git a/debian/squeeze/kdepim/debian/kaddressbook-trinity.manpages b/debian/_base/kdepim/debian/kaddressbook-trinity.manpages
index 74ba46e49..74ba46e49 100644
--- a/debian/squeeze/kdepim/debian/kaddressbook-trinity.manpages
+++ b/debian/_base/kdepim/debian/kaddressbook-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kaddressbook-trinity.menu b/debian/_base/kdepim/debian/kaddressbook-trinity.menu
index e8ffd03da..e8ffd03da 100644
--- a/debian/squeeze/kdepim/debian/kaddressbook-trinity.menu
+++ b/debian/_base/kdepim/debian/kaddressbook-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/kalarm-trinity.install b/debian/_base/kdepim/debian/kalarm-trinity.install
index a191321ec..a191321ec 100644
--- a/debian/squeeze/kdepim/debian/kalarm-trinity.install
+++ b/debian/_base/kdepim/debian/kalarm-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kalarm-trinity.links b/debian/_base/kdepim/debian/kalarm-trinity.links
index 436bd4cca..436bd4cca 100644
--- a/debian/squeeze/kdepim/debian/kalarm-trinity.links
+++ b/debian/_base/kdepim/debian/kalarm-trinity.links
diff --git a/debian/squeeze/kdepim/debian/kalarm-trinity.manpages b/debian/_base/kdepim/debian/kalarm-trinity.manpages
index 5be431fd7..5be431fd7 100644
--- a/debian/squeeze/kdepim/debian/kalarm-trinity.manpages
+++ b/debian/_base/kdepim/debian/kalarm-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kalarm-trinity.menu b/debian/_base/kdepim/debian/kalarm-trinity.menu
index 9042b1f8f..9042b1f8f 100644
--- a/debian/squeeze/kdepim/debian/kalarm-trinity.menu
+++ b/debian/_base/kdepim/debian/kalarm-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/kandy-trinity.install b/debian/_base/kdepim/debian/kandy-trinity.install
index d42acd2ce..d42acd2ce 100644
--- a/debian/squeeze/kdepim/debian/kandy-trinity.install
+++ b/debian/_base/kdepim/debian/kandy-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kandy-trinity.links b/debian/_base/kdepim/debian/kandy-trinity.links
index f2d49c8a3..f2d49c8a3 100644
--- a/debian/squeeze/kdepim/debian/kandy-trinity.links
+++ b/debian/_base/kdepim/debian/kandy-trinity.links
diff --git a/debian/squeeze/kdepim/debian/kandy-trinity.manpages b/debian/_base/kdepim/debian/kandy-trinity.manpages
index 03554768f..03554768f 100644
--- a/debian/squeeze/kdepim/debian/kandy-trinity.manpages
+++ b/debian/_base/kdepim/debian/kandy-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kandy-trinity.menu b/debian/_base/kdepim/debian/kandy-trinity.menu
index 6166a1cb3..6166a1cb3 100644
--- a/debian/squeeze/kdepim/debian/kandy-trinity.menu
+++ b/debian/_base/kdepim/debian/kandy-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/karm-trinity.install b/debian/_base/kdepim/debian/karm-trinity.install
index a2a22b674..a2a22b674 100644
--- a/debian/squeeze/kdepim/debian/karm-trinity.install
+++ b/debian/_base/kdepim/debian/karm-trinity.install
diff --git a/debian/squeeze/kdepim/debian/karm-trinity.links b/debian/_base/kdepim/debian/karm-trinity.links
index 7ea1d2f25..7ea1d2f25 100644
--- a/debian/squeeze/kdepim/debian/karm-trinity.links
+++ b/debian/_base/kdepim/debian/karm-trinity.links
diff --git a/debian/squeeze/kdepim/debian/karm-trinity.manpages b/debian/_base/kdepim/debian/karm-trinity.manpages
index 0ae3f04a8..0ae3f04a8 100644
--- a/debian/squeeze/kdepim/debian/karm-trinity.manpages
+++ b/debian/_base/kdepim/debian/karm-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/karm-trinity.menu b/debian/_base/kdepim/debian/karm-trinity.menu
index 1d268ea7d..1d268ea7d 100644
--- a/debian/squeeze/kdepim/debian/karm-trinity.menu
+++ b/debian/_base/kdepim/debian/karm-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook
index 22de9f47d..22de9f47d 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kalarm b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kalarm
index 945098a05..945098a05 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kalarm
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kalarm
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kandy b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kandy
index 9b7856c7c..9b7856c7c 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kandy
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kandy
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.karm b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.karm
index 2df9047b4..2df9047b4 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.karm
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.karm
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kleopatra b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kleopatra
index 4912bdc06..4912bdc06 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kleopatra
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kleopatra
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kmail b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kmail
index 98506502f..98506502f 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kmail
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kmail
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.knode b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.knode
index 230718ab6..230718ab6 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.knode
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.knode
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.knotes b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.knotes
index 9e79a178a..9e79a178a 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.knotes
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.knotes
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
index d5fe22989..d5fe22989 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kontact b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kontact
index 080a8abce..080a8abce 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kontact
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kontact
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.korganizer b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.korganizer
index 6a9cc6494..6a9cc6494 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.korganizer
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.korganizer
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.korn b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.korn
index 9315f091d..9315f091d 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.korn
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.korn
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kpilot b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kpilot
index 85f7e7f3c..85f7e7f3c 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kpilot
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kpilot
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.ktnef b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.ktnef
index 87c81087d..87c81087d 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.ktnef
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.ktnef
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
index b5e43637f..b5e43637f 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
diff --git a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.multisynk b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.multisynk
index 5e1dc3a81..5e1dc3a81 100644
--- a/debian/squeeze/kdepim/debian/kdepim-doc-html.doc-base.multisynk
+++ b/debian/_base/kdepim/debian/kdepim-doc-html.doc-base.multisynk
diff --git a/debian/squeeze/kdepim/debian/kdepim-kfile-plugins-trinity.install b/debian/_base/kdepim/debian/kdepim-kfile-plugins-trinity.install
index 3f39aaf87..3f39aaf87 100644
--- a/debian/squeeze/kdepim/debian/kdepim-kfile-plugins-trinity.install
+++ b/debian/_base/kdepim/debian/kdepim-kfile-plugins-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kdepim-kio-plugins-trinity.install b/debian/_base/kdepim/debian/kdepim-kio-plugins-trinity.install
index f9cc8ca27..f9cc8ca27 100644
--- a/debian/squeeze/kdepim/debian/kdepim-kio-plugins-trinity.install
+++ b/debian/_base/kdepim/debian/kdepim-kio-plugins-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kdepim-kresources-trinity.install b/debian/_base/kdepim/debian/kdepim-kresources-trinity.install
index 588b690b1..588b690b1 100644
--- a/debian/squeeze/kdepim/debian/kdepim-kresources-trinity.install
+++ b/debian/_base/kdepim/debian/kdepim-kresources-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kdepim-trinity-dev.install b/debian/_base/kdepim/debian/kdepim-trinity-dev.install
index bec38f84a..bec38f84a 100644
--- a/debian/squeeze/kdepim/debian/kdepim-trinity-dev.install
+++ b/debian/_base/kdepim/debian/kdepim-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/kdepim-trinity-doc.doc-base b/debian/_base/kdepim/debian/kdepim-trinity-doc.doc-base
index 847262d64..847262d64 100644
--- a/debian/squeeze/kdepim/debian/kdepim-trinity-doc.doc-base
+++ b/debian/_base/kdepim/debian/kdepim-trinity-doc.doc-base
diff --git a/debian/squeeze/kdepim/debian/kdepim-trinity-doc.install b/debian/_base/kdepim/debian/kdepim-trinity-doc.install
index c89dce2b0..c89dce2b0 100644
--- a/debian/squeeze/kdepim/debian/kdepim-trinity-doc.install
+++ b/debian/_base/kdepim/debian/kdepim-trinity-doc.install
diff --git a/debian/squeeze/kdepim/debian/kdepim-wizards-trinity.install b/debian/_base/kdepim/debian/kdepim-wizards-trinity.install
index 465782c25..465782c25 100644
--- a/debian/squeeze/kdepim/debian/kdepim-wizards-trinity.install
+++ b/debian/_base/kdepim/debian/kdepim-wizards-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kdepim-wizards-trinity.manpages b/debian/_base/kdepim/debian/kdepim-wizards-trinity.manpages
index 04a5781f5..04a5781f5 100644
--- a/debian/squeeze/kdepim/debian/kdepim-wizards-trinity.manpages
+++ b/debian/_base/kdepim/debian/kdepim-wizards-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kdepim-wizards-trinity.menu b/debian/_base/kdepim/debian/kdepim-wizards-trinity.menu
index c622368a5..c622368a5 100644
--- a/debian/squeeze/kdepim/debian/kdepim-wizards-trinity.menu
+++ b/debian/_base/kdepim/debian/kdepim-wizards-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/kitchensync-trinity.install b/debian/_base/kdepim/debian/kitchensync-trinity.install
index cdf89734d..cdf89734d 100644
--- a/debian/squeeze/kdepim/debian/kitchensync-trinity.install
+++ b/debian/_base/kdepim/debian/kitchensync-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kitchensync-trinity.manpages b/debian/_base/kdepim/debian/kitchensync-trinity.manpages
index f921c8c0e..f921c8c0e 100644
--- a/debian/squeeze/kdepim/debian/kitchensync-trinity.manpages
+++ b/debian/_base/kdepim/debian/kitchensync-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kitchensync-trinity.menu b/debian/_base/kdepim/debian/kitchensync-trinity.menu
index 3e47d5786..3e47d5786 100644
--- a/debian/squeeze/kdepim/debian/kitchensync-trinity.menu
+++ b/debian/_base/kdepim/debian/kitchensync-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/kleopatra-trinity.install b/debian/_base/kdepim/debian/kleopatra-trinity.install
index 2e5241ad1..2e5241ad1 100644
--- a/debian/squeeze/kdepim/debian/kleopatra-trinity.install
+++ b/debian/_base/kdepim/debian/kleopatra-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kleopatra-trinity.links b/debian/_base/kdepim/debian/kleopatra-trinity.links
index 89f636dcd..89f636dcd 100644
--- a/debian/squeeze/kdepim/debian/kleopatra-trinity.links
+++ b/debian/_base/kdepim/debian/kleopatra-trinity.links
diff --git a/debian/squeeze/kdepim/debian/kleopatra-trinity.manpages b/debian/_base/kdepim/debian/kleopatra-trinity.manpages
index 37a8fdc2f..37a8fdc2f 100644
--- a/debian/squeeze/kdepim/debian/kleopatra-trinity.manpages
+++ b/debian/_base/kdepim/debian/kleopatra-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kleopatra-trinity.menu b/debian/_base/kdepim/debian/kleopatra-trinity.menu
index c243663c9..c243663c9 100644
--- a/debian/squeeze/kdepim/debian/kleopatra-trinity.menu
+++ b/debian/_base/kdepim/debian/kleopatra-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/kmail-trinity.install b/debian/_base/kdepim/debian/kmail-trinity.install
index 54df014f9..54df014f9 100644
--- a/debian/squeeze/kdepim/debian/kmail-trinity.install
+++ b/debian/_base/kdepim/debian/kmail-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kmail-trinity.links b/debian/_base/kdepim/debian/kmail-trinity.links
index 21e8a877a..21e8a877a 100644
--- a/debian/squeeze/kdepim/debian/kmail-trinity.links
+++ b/debian/_base/kdepim/debian/kmail-trinity.links
diff --git a/debian/squeeze/kdepim/debian/kmail-trinity.manpages b/debian/_base/kdepim/debian/kmail-trinity.manpages
index 5a5b3a51e..5a5b3a51e 100644
--- a/debian/squeeze/kdepim/debian/kmail-trinity.manpages
+++ b/debian/_base/kdepim/debian/kmail-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kmail-trinity.menu b/debian/_base/kdepim/debian/kmail-trinity.menu
index 186aa91b5..186aa91b5 100644
--- a/debian/squeeze/kdepim/debian/kmail-trinity.menu
+++ b/debian/_base/kdepim/debian/kmail-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/kmail.NEWS b/debian/_base/kdepim/debian/kmail.NEWS
index af3b48cf6..af3b48cf6 100644
--- a/debian/squeeze/kdepim/debian/kmail.NEWS
+++ b/debian/_base/kdepim/debian/kmail.NEWS
diff --git a/debian/squeeze/kdepim/debian/kmail.README.Debian b/debian/_base/kdepim/debian/kmail.README.Debian
index 9737546e2..9737546e2 100644
--- a/debian/squeeze/kdepim/debian/kmail.README.Debian
+++ b/debian/_base/kdepim/debian/kmail.README.Debian
diff --git a/debian/squeeze/kdepim/debian/kmailcvt-trinity.install b/debian/_base/kdepim/debian/kmailcvt-trinity.install
index 967e8fd24..967e8fd24 100644
--- a/debian/squeeze/kdepim/debian/kmailcvt-trinity.install
+++ b/debian/_base/kdepim/debian/kmailcvt-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kmailcvt-trinity.manpages b/debian/_base/kdepim/debian/kmailcvt-trinity.manpages
index 4eb8c2067..4eb8c2067 100644
--- a/debian/squeeze/kdepim/debian/kmailcvt-trinity.manpages
+++ b/debian/_base/kdepim/debian/kmailcvt-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kmailcvt-trinity.menu b/debian/_base/kdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..1fdaa32b6 100644
--- a/debian/squeeze/kdepim/debian/kmailcvt-trinity.menu
+++ b/debian/_base/kdepim/debian/kmailcvt-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/knode-trinity.install b/debian/_base/kdepim/debian/knode-trinity.install
index 964e43e76..964e43e76 100644
--- a/debian/squeeze/kdepim/debian/knode-trinity.install
+++ b/debian/_base/kdepim/debian/knode-trinity.install
diff --git a/debian/squeeze/kdepim/debian/knode-trinity.links b/debian/_base/kdepim/debian/knode-trinity.links
index 61dd05e51..61dd05e51 100644
--- a/debian/squeeze/kdepim/debian/knode-trinity.links
+++ b/debian/_base/kdepim/debian/knode-trinity.links
diff --git a/debian/squeeze/kdepim/debian/knode-trinity.manpages b/debian/_base/kdepim/debian/knode-trinity.manpages
index 72c9b5b9b..72c9b5b9b 100644
--- a/debian/squeeze/kdepim/debian/knode-trinity.manpages
+++ b/debian/_base/kdepim/debian/knode-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/knode-trinity.menu b/debian/_base/kdepim/debian/knode-trinity.menu
index 97a22d6ab..97a22d6ab 100644
--- a/debian/squeeze/kdepim/debian/knode-trinity.menu
+++ b/debian/_base/kdepim/debian/knode-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/knotes-trinity.install b/debian/_base/kdepim/debian/knotes-trinity.install
index 602954d5d..602954d5d 100644
--- a/debian/squeeze/kdepim/debian/knotes-trinity.install
+++ b/debian/_base/kdepim/debian/knotes-trinity.install
diff --git a/debian/squeeze/kdepim/debian/knotes-trinity.links b/debian/_base/kdepim/debian/knotes-trinity.links
index 1ba2fa093..1ba2fa093 100644
--- a/debian/squeeze/kdepim/debian/knotes-trinity.links
+++ b/debian/_base/kdepim/debian/knotes-trinity.links
diff --git a/debian/squeeze/kdepim/debian/knotes-trinity.manpages b/debian/_base/kdepim/debian/knotes-trinity.manpages
index ef942a499..ef942a499 100644
--- a/debian/squeeze/kdepim/debian/knotes-trinity.manpages
+++ b/debian/_base/kdepim/debian/knotes-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/knotes-trinity.menu b/debian/_base/kdepim/debian/knotes-trinity.menu
index ed71f1012..ed71f1012 100644
--- a/debian/squeeze/kdepim/debian/knotes-trinity.menu
+++ b/debian/_base/kdepim/debian/knotes-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/knotes-trinity.preinst b/debian/_base/kdepim/debian/knotes-trinity.preinst
index a56aa3945..a56aa3945 100644
--- a/debian/squeeze/kdepim/debian/knotes-trinity.preinst
+++ b/debian/_base/kdepim/debian/knotes-trinity.preinst
diff --git a/debian/squeeze/kdepim/debian/kode-trinity.install b/debian/_base/kdepim/debian/kode-trinity.install
index 2097cf80b..2097cf80b 100644
--- a/debian/squeeze/kdepim/debian/kode-trinity.install
+++ b/debian/_base/kdepim/debian/kode-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kode-trinity.manpages b/debian/_base/kdepim/debian/kode-trinity.manpages
index 0c947e5fb..0c947e5fb 100644
--- a/debian/squeeze/kdepim/debian/kode-trinity.manpages
+++ b/debian/_base/kdepim/debian/kode-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/konsolekalendar-trinity.install b/debian/_base/kdepim/debian/konsolekalendar-trinity.install
index 5f5765429..5f5765429 100644
--- a/debian/squeeze/kdepim/debian/konsolekalendar-trinity.install
+++ b/debian/_base/kdepim/debian/konsolekalendar-trinity.install
diff --git a/debian/squeeze/kdepim/debian/konsolekalendar-trinity.links b/debian/_base/kdepim/debian/konsolekalendar-trinity.links
index 423b5c172..423b5c172 100644
--- a/debian/squeeze/kdepim/debian/konsolekalendar-trinity.links
+++ b/debian/_base/kdepim/debian/konsolekalendar-trinity.links
diff --git a/debian/squeeze/kdepim/debian/konsolekalendar-trinity.manpages b/debian/_base/kdepim/debian/konsolekalendar-trinity.manpages
index 8af64605b..8af64605b 100644
--- a/debian/squeeze/kdepim/debian/konsolekalendar-trinity.manpages
+++ b/debian/_base/kdepim/debian/konsolekalendar-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kontact-trinity.install b/debian/_base/kdepim/debian/kontact-trinity.install
index 4c0bc653b..4c0bc653b 100644
--- a/debian/squeeze/kdepim/debian/kontact-trinity.install
+++ b/debian/_base/kdepim/debian/kontact-trinity.install
diff --git a/debian/squeeze/kdepim/debian/kontact-trinity.links b/debian/_base/kdepim/debian/kontact-trinity.links
index 9f0e2beff..9f0e2beff 100644
--- a/debian/squeeze/kdepim/debian/kontact-trinity.links
+++ b/debian/_base/kdepim/debian/kontact-trinity.links
diff --git a/debian/squeeze/kdepim/debian/kontact-trinity.manpages b/debian/_base/kdepim/debian/kontact-trinity.manpages
index a2900a879..a2900a879 100644
--- a/debian/squeeze/kdepim/debian/kontact-trinity.manpages
+++ b/debian/_base/kdepim/debian/kontact-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/kontact-trinity.menu b/debian/_base/kdepim/debian/kontact-trinity.menu
index 04ef20207..04ef20207 100644
--- a/debian/squeeze/kdepim/debian/kontact-trinity.menu
+++ b/debian/_base/kdepim/debian/kontact-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/korganizer-trinity.install b/debian/_base/kdepim/debian/korganizer-trinity.install
index f5b60b56b..f5b60b56b 100644
--- a/debian/squeeze/kdepim/debian/korganizer-trinity.install
+++ b/debian/_base/kdepim/debian/korganizer-trinity.install
diff --git a/debian/squeeze/kdepim/debian/korganizer-trinity.links b/debian/_base/kdepim/debian/korganizer-trinity.links
index 608fc7441..608fc7441 100644
--- a/debian/squeeze/kdepim/debian/korganizer-trinity.links
+++ b/debian/_base/kdepim/debian/korganizer-trinity.links
diff --git a/debian/squeeze/kdepim/debian/korganizer-trinity.manpages b/debian/_base/kdepim/debian/korganizer-trinity.manpages
index 64d6e1199..64d6e1199 100644
--- a/debian/squeeze/kdepim/debian/korganizer-trinity.manpages
+++ b/debian/_base/kdepim/debian/korganizer-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/korganizer-trinity.menu b/debian/_base/kdepim/debian/korganizer-trinity.menu
index d5d1f0aaf..d5d1f0aaf 100644
--- a/debian/squeeze/kdepim/debian/korganizer-trinity.menu
+++ b/debian/_base/kdepim/debian/korganizer-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/korn-trinity.install b/debian/_base/kdepim/debian/korn-trinity.install
index 5b1c7fdaf..5b1c7fdaf 100644
--- a/debian/squeeze/kdepim/debian/korn-trinity.install
+++ b/debian/_base/kdepim/debian/korn-trinity.install
diff --git a/debian/squeeze/kdepim/debian/korn-trinity.links b/debian/_base/kdepim/debian/korn-trinity.links
index 915338e25..915338e25 100644
--- a/debian/squeeze/kdepim/debian/korn-trinity.links
+++ b/debian/_base/kdepim/debian/korn-trinity.links
diff --git a/debian/squeeze/kdepim/debian/korn-trinity.manpages b/debian/_base/kdepim/debian/korn-trinity.manpages
index 7a67836ba..7a67836ba 100644
--- a/debian/squeeze/kdepim/debian/korn-trinity.manpages
+++ b/debian/_base/kdepim/debian/korn-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/korn-trinity.menu b/debian/_base/kdepim/debian/korn-trinity.menu
index 8187a30d3..8187a30d3 100644
--- a/debian/squeeze/kdepim/debian/korn-trinity.menu
+++ b/debian/_base/kdepim/debian/korn-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/ktnef-trinity.install b/debian/_base/kdepim/debian/ktnef-trinity.install
index 1f299a543..1f299a543 100644
--- a/debian/squeeze/kdepim/debian/ktnef-trinity.install
+++ b/debian/_base/kdepim/debian/ktnef-trinity.install
diff --git a/debian/squeeze/kdepim/debian/ktnef-trinity.links b/debian/_base/kdepim/debian/ktnef-trinity.links
index c93eb29f5..c93eb29f5 100644
--- a/debian/squeeze/kdepim/debian/ktnef-trinity.links
+++ b/debian/_base/kdepim/debian/ktnef-trinity.links
diff --git a/debian/squeeze/kdepim/debian/ktnef-trinity.manpages b/debian/_base/kdepim/debian/ktnef-trinity.manpages
index 7a8886ac6..7a8886ac6 100644
--- a/debian/squeeze/kdepim/debian/ktnef-trinity.manpages
+++ b/debian/_base/kdepim/debian/ktnef-trinity.manpages
diff --git a/debian/squeeze/kdepim/debian/ktnef-trinity.menu b/debian/_base/kdepim/debian/ktnef-trinity.menu
index df93e1181..df93e1181 100644
--- a/debian/squeeze/kdepim/debian/ktnef-trinity.menu
+++ b/debian/_base/kdepim/debian/ktnef-trinity.menu
diff --git a/debian/squeeze/kdepim/debian/ktnef-trinity.mime b/debian/_base/kdepim/debian/ktnef-trinity.mime
index 35a952194..35a952194 100644
--- a/debian/squeeze/kdepim/debian/ktnef-trinity.mime
+++ b/debian/_base/kdepim/debian/ktnef-trinity.mime
diff --git a/debian/squeeze/kdepim/debian/libindex0-trinity-dev.docs b/debian/_base/kdepim/debian/libindex0-trinity-dev.docs
index aa30f8b2c..aa30f8b2c 100644
--- a/debian/squeeze/kdepim/debian/libindex0-trinity-dev.docs
+++ b/debian/_base/kdepim/debian/libindex0-trinity-dev.docs
diff --git a/debian/squeeze/kdepim/debian/libindex0-trinity-dev.install b/debian/_base/kdepim/debian/libindex0-trinity-dev.install
index 6e84a12b1..6e84a12b1 100644
--- a/debian/squeeze/kdepim/debian/libindex0-trinity-dev.install
+++ b/debian/_base/kdepim/debian/libindex0-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/libindex0-trinity.install b/debian/_base/kdepim/debian/libindex0-trinity.install
index 2a278e4fe..2a278e4fe 100644
--- a/debian/squeeze/kdepim/debian/libindex0-trinity.install
+++ b/debian/_base/kdepim/debian/libindex0-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libkcal2-trinity-dev.install b/debian/_base/kdepim/debian/libkcal2-trinity-dev.install
index a36a88caa..a36a88caa 100644
--- a/debian/squeeze/kdepim/debian/libkcal2-trinity-dev.install
+++ b/debian/_base/kdepim/debian/libkcal2-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/libkcal2b-trinity.install b/debian/_base/kdepim/debian/libkcal2b-trinity.install
index ca6e71652..ca6e71652 100644
--- a/debian/squeeze/kdepim/debian/libkcal2b-trinity.install
+++ b/debian/_base/kdepim/debian/libkcal2b-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libkdepim1-trinity-dev.install b/debian/_base/kdepim/debian/libkdepim1-trinity-dev.install
index 236131ea6..236131ea6 100644
--- a/debian/squeeze/kdepim/debian/libkdepim1-trinity-dev.install
+++ b/debian/_base/kdepim/debian/libkdepim1-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/libkdepim1a-trinity.install b/debian/_base/kdepim/debian/libkdepim1a-trinity.install
index b7799470a..b7799470a 100644
--- a/debian/squeeze/kdepim/debian/libkdepim1a-trinity.install
+++ b/debian/_base/kdepim/debian/libkdepim1a-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libkgantt0-trinity-dev.install b/debian/_base/kdepim/debian/libkgantt0-trinity-dev.install
index e042469fa..e042469fa 100644
--- a/debian/squeeze/kdepim/debian/libkgantt0-trinity-dev.install
+++ b/debian/_base/kdepim/debian/libkgantt0-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/libkgantt0-trinity.install b/debian/_base/kdepim/debian/libkgantt0-trinity.install
index d3cf0216a..d3cf0216a 100644
--- a/debian/squeeze/kdepim/debian/libkgantt0-trinity.install
+++ b/debian/_base/kdepim/debian/libkgantt0-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libkleopatra1-trinity-dev.install b/debian/_base/kdepim/debian/libkleopatra1-trinity-dev.install
index 6ac5db793..6ac5db793 100644
--- a/debian/squeeze/kdepim/debian/libkleopatra1-trinity-dev.install
+++ b/debian/_base/kdepim/debian/libkleopatra1-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/libkleopatra1-trinity.install b/debian/_base/kdepim/debian/libkleopatra1-trinity.install
index 88ef2ab95..88ef2ab95 100644
--- a/debian/squeeze/kdepim/debian/libkleopatra1-trinity.install
+++ b/debian/_base/kdepim/debian/libkleopatra1-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libkmime2-trinity.install b/debian/_base/kdepim/debian/libkmime2-trinity.install
index ef3533fbe..ef3533fbe 100644
--- a/debian/squeeze/kdepim/debian/libkmime2-trinity.install
+++ b/debian/_base/kdepim/debian/libkmime2-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libkpimexchange1-trinity-dev.install b/debian/_base/kdepim/debian/libkpimexchange1-trinity-dev.install
index 88536e532..88536e532 100644
--- a/debian/squeeze/kdepim/debian/libkpimexchange1-trinity-dev.install
+++ b/debian/_base/kdepim/debian/libkpimexchange1-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/libkpimexchange1-trinity.install b/debian/_base/kdepim/debian/libkpimexchange1-trinity.install
index f5b098575..f5b098575 100644
--- a/debian/squeeze/kdepim/debian/libkpimexchange1-trinity.install
+++ b/debian/_base/kdepim/debian/libkpimexchange1-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libkpimidentities1-trinity.install b/debian/_base/kdepim/debian/libkpimidentities1-trinity.install
index 156f7036c..156f7036c 100644
--- a/debian/squeeze/kdepim/debian/libkpimidentities1-trinity.install
+++ b/debian/_base/kdepim/debian/libkpimidentities1-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libksieve0-trinity-dev.install b/debian/_base/kdepim/debian/libksieve0-trinity-dev.install
index 2f74cc12f..2f74cc12f 100644
--- a/debian/squeeze/kdepim/debian/libksieve0-trinity-dev.install
+++ b/debian/_base/kdepim/debian/libksieve0-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/libksieve0-trinity.install b/debian/_base/kdepim/debian/libksieve0-trinity.install
index 3e139e6b2..3e139e6b2 100644
--- a/debian/squeeze/kdepim/debian/libksieve0-trinity.install
+++ b/debian/_base/kdepim/debian/libksieve0-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libktnef1-trinity-dev.install b/debian/_base/kdepim/debian/libktnef1-trinity-dev.install
index 03b67df5b..03b67df5b 100644
--- a/debian/squeeze/kdepim/debian/libktnef1-trinity-dev.install
+++ b/debian/_base/kdepim/debian/libktnef1-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/libktnef1-trinity.install b/debian/_base/kdepim/debian/libktnef1-trinity.install
index b956b9b12..b956b9b12 100644
--- a/debian/squeeze/kdepim/debian/libktnef1-trinity.install
+++ b/debian/_base/kdepim/debian/libktnef1-trinity.install
diff --git a/debian/squeeze/kdepim/debian/libmimelib1-trinity-dev.install b/debian/_base/kdepim/debian/libmimelib1-trinity-dev.install
index d843ad5b8..d843ad5b8 100644
--- a/debian/squeeze/kdepim/debian/libmimelib1-trinity-dev.install
+++ b/debian/_base/kdepim/debian/libmimelib1-trinity-dev.install
diff --git a/debian/squeeze/kdepim/debian/libmimelib1c2a-trinity.install b/debian/_base/kdepim/debian/libmimelib1c2a-trinity.install
index 3d4feb108..3d4feb108 100644
--- a/debian/squeeze/kdepim/debian/libmimelib1c2a-trinity.install
+++ b/debian/_base/kdepim/debian/libmimelib1c2a-trinity.install
diff --git a/debian/squeeze/kdepim/debian/man/akregator-trinity.man b/debian/_base/kdepim/debian/man/akregator-trinity.man
index 5913cc461..5913cc461 100644
--- a/debian/squeeze/kdepim/debian/man/akregator-trinity.man
+++ b/debian/_base/kdepim/debian/man/akregator-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/egroupwarewizard-trinity.man b/debian/_base/kdepim/debian/man/egroupwarewizard-trinity.man
index 2ba3d8f79..2ba3d8f79 100644
--- a/debian/squeeze/kdepim/debian/man/egroupwarewizard-trinity.man
+++ b/debian/_base/kdepim/debian/man/egroupwarewizard-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/exchangewizard-trinity.man b/debian/_base/kdepim/debian/man/exchangewizard-trinity.man
index 87357e872..87357e872 100644
--- a/debian/squeeze/kdepim/debian/man/exchangewizard-trinity.man
+++ b/debian/_base/kdepim/debian/man/exchangewizard-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/groupwarewizard-trinity.man b/debian/_base/kdepim/debian/man/groupwarewizard-trinity.man
index 9e6adf77b..9e6adf77b 100644
--- a/debian/squeeze/kdepim/debian/man/groupwarewizard-trinity.man
+++ b/debian/_base/kdepim/debian/man/groupwarewizard-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/groupwisewizard-trinity.man b/debian/_base/kdepim/debian/man/groupwisewizard-trinity.man
index 947ea86e2..947ea86e2 100644
--- a/debian/squeeze/kdepim/debian/man/groupwisewizard-trinity.man
+++ b/debian/_base/kdepim/debian/man/groupwisewizard-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/ical2vcal-trinity.man b/debian/_base/kdepim/debian/man/ical2vcal-trinity.man
index d6adbaa01..d6adbaa01 100644
--- a/debian/squeeze/kdepim/debian/man/ical2vcal-trinity.man
+++ b/debian/_base/kdepim/debian/man/ical2vcal-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kabc2mutt-trinity.man b/debian/_base/kdepim/debian/man/kabc2mutt-trinity.man
index b62278dc6..b62278dc6 100644
--- a/debian/squeeze/kdepim/debian/man/kabc2mutt-trinity.man
+++ b/debian/_base/kdepim/debian/man/kabc2mutt-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kaddressbook-trinity.man b/debian/_base/kdepim/debian/man/kaddressbook-trinity.man
index 04d47b403..04d47b403 100644
--- a/debian/squeeze/kdepim/debian/man/kaddressbook-trinity.man
+++ b/debian/_base/kdepim/debian/man/kaddressbook-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kalarm-trinity.man b/debian/_base/kdepim/debian/man/kalarm-trinity.man
index 71322519b..71322519b 100644
--- a/debian/squeeze/kdepim/debian/man/kalarm-trinity.man
+++ b/debian/_base/kdepim/debian/man/kalarm-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kalarmd-trinity.man b/debian/_base/kdepim/debian/man/kalarmd-trinity.man
index 4c639b377..4c639b377 100644
--- a/debian/squeeze/kdepim/debian/man/kalarmd-trinity.man
+++ b/debian/_base/kdepim/debian/man/kalarmd-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kandy-trinity.man b/debian/_base/kdepim/debian/man/kandy-trinity.man
index bcef93b4d..bcef93b4d 100644
--- a/debian/squeeze/kdepim/debian/man/kandy-trinity.man
+++ b/debian/_base/kdepim/debian/man/kandy-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kandy_client-trinity.man b/debian/_base/kdepim/debian/man/kandy_client-trinity.man
index 394366e0a..394366e0a 100644
--- a/debian/squeeze/kdepim/debian/man/kandy_client-trinity.man
+++ b/debian/_base/kdepim/debian/man/kandy_client-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/karm-trinity.man b/debian/_base/kdepim/debian/man/karm-trinity.man
index f187d051f..f187d051f 100644
--- a/debian/squeeze/kdepim/debian/man/karm-trinity.man
+++ b/debian/_base/kdepim/debian/man/karm-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kdeopt.part b/debian/_base/kdepim/debian/man/kdeopt.part
index d258f0ad1..d258f0ad1 100644
--- a/debian/squeeze/kdepim/debian/man/kdeopt.part
+++ b/debian/_base/kdepim/debian/man/kdeopt.part
diff --git a/debian/squeeze/kdepim/debian/man/kitchensync-trinity.man b/debian/_base/kdepim/debian/man/kitchensync-trinity.man
index cd970e90b..cd970e90b 100644
--- a/debian/squeeze/kdepim/debian/man/kitchensync-trinity.man
+++ b/debian/_base/kdepim/debian/man/kitchensync-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kleopatra-trinity.man b/debian/_base/kdepim/debian/man/kleopatra-trinity.man
index ea7a7487d..ea7a7487d 100644
--- a/debian/squeeze/kdepim/debian/man/kleopatra-trinity.man
+++ b/debian/_base/kdepim/debian/man/kleopatra-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kmail-trinity.man b/debian/_base/kdepim/debian/man/kmail-trinity.man
index 948462a5f..948462a5f 100644
--- a/debian/squeeze/kdepim/debian/man/kmail-trinity.man
+++ b/debian/_base/kdepim/debian/man/kmail-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kmail_antivir.sh-trinity.man b/debian/_base/kdepim/debian/man/kmail_antivir.sh-trinity.man
index 53b347173..53b347173 100644
--- a/debian/squeeze/kdepim/debian/man/kmail_antivir.sh-trinity.man
+++ b/debian/_base/kdepim/debian/man/kmail_antivir.sh-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kmail_clamav.sh-trinity.man b/debian/_base/kdepim/debian/man/kmail_clamav.sh-trinity.man
index 90cd51899..90cd51899 100644
--- a/debian/squeeze/kdepim/debian/man/kmail_clamav.sh-trinity.man
+++ b/debian/_base/kdepim/debian/man/kmail_clamav.sh-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kmail_fprot.sh-trinity.man b/debian/_base/kdepim/debian/man/kmail_fprot.sh-trinity.man
index e44a2ee6a..e44a2ee6a 100644
--- a/debian/squeeze/kdepim/debian/man/kmail_fprot.sh-trinity.man
+++ b/debian/_base/kdepim/debian/man/kmail_fprot.sh-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kmail_sav.sh-trinity.man b/debian/_base/kdepim/debian/man/kmail_sav.sh-trinity.man
index 64eb01ab6..64eb01ab6 100644
--- a/debian/squeeze/kdepim/debian/man/kmail_sav.sh-trinity.man
+++ b/debian/_base/kdepim/debian/man/kmail_sav.sh-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kmailcvt-trinity.man b/debian/_base/kdepim/debian/man/kmailcvt-trinity.man
index f76bf7e7a..f76bf7e7a 100644
--- a/debian/squeeze/kdepim/debian/man/kmailcvt-trinity.man
+++ b/debian/_base/kdepim/debian/man/kmailcvt-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/knode-trinity.man b/debian/_base/kdepim/debian/man/knode-trinity.man
index b237490c9..b237490c9 100644
--- a/debian/squeeze/kdepim/debian/man/knode-trinity.man
+++ b/debian/_base/kdepim/debian/man/knode-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/knotes-trinity.man b/debian/_base/kdepim/debian/man/knotes-trinity.man
index 77380be9a..77380be9a 100644
--- a/debian/squeeze/kdepim/debian/man/knotes-trinity.man
+++ b/debian/_base/kdepim/debian/man/knotes-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kode-trinity.man b/debian/_base/kdepim/debian/man/kode-trinity.man
index 183fc77b5..183fc77b5 100644
--- a/debian/squeeze/kdepim/debian/man/kode-trinity.man
+++ b/debian/_base/kdepim/debian/man/kode-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kolabwizard-trinity.man b/debian/_base/kdepim/debian/man/kolabwizard-trinity.man
index 1329458ee..1329458ee 100644
--- a/debian/squeeze/kdepim/debian/man/kolabwizard-trinity.man
+++ b/debian/_base/kdepim/debian/man/kolabwizard-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/konsolekalendar-trinity.man b/debian/_base/kdepim/debian/man/konsolekalendar-trinity.man
index 7d8f7efab..7d8f7efab 100644
--- a/debian/squeeze/kdepim/debian/man/konsolekalendar-trinity.man
+++ b/debian/_base/kdepim/debian/man/konsolekalendar-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kontact-trinity.man b/debian/_base/kdepim/debian/man/kontact-trinity.man
index 3f712f1e6..3f712f1e6 100644
--- a/debian/squeeze/kdepim/debian/man/kontact-trinity.man
+++ b/debian/_base/kdepim/debian/man/kontact-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/korgac-trinity.man b/debian/_base/kdepim/debian/man/korgac-trinity.man
index ced615aeb..ced615aeb 100644
--- a/debian/squeeze/kdepim/debian/man/korgac-trinity.man
+++ b/debian/_base/kdepim/debian/man/korgac-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/korganizer-trinity.man b/debian/_base/kdepim/debian/man/korganizer-trinity.man
index e11c28620..e11c28620 100644
--- a/debian/squeeze/kdepim/debian/man/korganizer-trinity.man
+++ b/debian/_base/kdepim/debian/man/korganizer-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/korn-trinity.man b/debian/_base/kdepim/debian/man/korn-trinity.man
index 44e62c1a0..44e62c1a0 100644
--- a/debian/squeeze/kdepim/debian/man/korn-trinity.man
+++ b/debian/_base/kdepim/debian/man/korn-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kpalmdoc-trinity.man b/debian/_base/kdepim/debian/man/kpalmdoc-trinity.man
index 3bbfc16ea..3bbfc16ea 100644
--- a/debian/squeeze/kdepim/debian/man/kpalmdoc-trinity.man
+++ b/debian/_base/kdepim/debian/man/kpalmdoc-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kpilot-trinity.man b/debian/_base/kdepim/debian/man/kpilot-trinity.man
index 923de2776..923de2776 100644
--- a/debian/squeeze/kdepim/debian/man/kpilot-trinity.man
+++ b/debian/_base/kdepim/debian/man/kpilot-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kpilotDaemon-trinity.man b/debian/_base/kdepim/debian/man/kpilotDaemon-trinity.man
index c58a2065d..c58a2065d 100644
--- a/debian/squeeze/kdepim/debian/man/kpilotDaemon-trinity.man
+++ b/debian/_base/kdepim/debian/man/kpilotDaemon-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/ksync-trinity.man b/debian/_base/kdepim/debian/man/ksync-trinity.man
index c62365b1f..c62365b1f 100644
--- a/debian/squeeze/kdepim/debian/man/ksync-trinity.man
+++ b/debian/_base/kdepim/debian/man/ksync-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/ktnef-trinity.man b/debian/_base/kdepim/debian/man/ktnef-trinity.man
index 8c1402996..8c1402996 100644
--- a/debian/squeeze/kdepim/debian/man/ktnef-trinity.man
+++ b/debian/_base/kdepim/debian/man/ktnef-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kwatchgnupg-trinity.man b/debian/_base/kdepim/debian/man/kwatchgnupg-trinity.man
index fe9504b3b..fe9504b3b 100644
--- a/debian/squeeze/kdepim/debian/man/kwatchgnupg-trinity.man
+++ b/debian/_base/kdepim/debian/man/kwatchgnupg-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/kxml_compiler-trinity.man b/debian/_base/kdepim/debian/man/kxml_compiler-trinity.man
index 90d7a0ea9..90d7a0ea9 100644
--- a/debian/squeeze/kdepim/debian/man/kxml_compiler-trinity.man
+++ b/debian/_base/kdepim/debian/man/kxml_compiler-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/multisynk-trinity.man b/debian/_base/kdepim/debian/man/multisynk-trinity.man
index ffcfa5fba..ffcfa5fba 100644
--- a/debian/squeeze/kdepim/debian/man/multisynk-trinity.man
+++ b/debian/_base/kdepim/debian/man/multisynk-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/networkstatustestservice-trinity.man b/debian/_base/kdepim/debian/man/networkstatustestservice-trinity.man
index 2d2f4a1be..2d2f4a1be 100644
--- a/debian/squeeze/kdepim/debian/man/networkstatustestservice-trinity.man
+++ b/debian/_base/kdepim/debian/man/networkstatustestservice-trinity.man
diff --git a/debian/squeeze/kdepim/debian/man/sloxwizard-trinity.man b/debian/_base/kdepim/debian/man/sloxwizard-trinity.man
index 18235ce81..18235ce81 100644
--- a/debian/squeeze/kdepim/debian/man/sloxwizard-trinity.man
+++ b/debian/_base/kdepim/debian/man/sloxwizard-trinity.man
diff --git a/debian/squeeze/kdepim/debian/patches/series b/debian/_base/kdepim/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/kdepim/debian/patches/series
+++ b/debian/_base/kdepim/debian/patches/series
diff --git a/debian/squeeze/kdepim/debian/rules b/debian/_base/kdepim/debian/rules
index 23a00eba7..23a00eba7 100755
--- a/debian/squeeze/kdepim/debian/rules
+++ b/debian/_base/kdepim/debian/rules
diff --git a/debian/squeeze/kdepim/debian/shlibs.local b/debian/_base/kdepim/debian/shlibs.local
index 85fbde26a..85fbde26a 100644
--- a/debian/squeeze/kdepim/debian/shlibs.local
+++ b/debian/_base/kdepim/debian/shlibs.local
diff --git a/debian/squeeze/kdepim/debian/source/format b/debian/_base/kdepim/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdepim/debian/source/format
+++ b/debian/_base/kdepim/debian/source/format
diff --git a/debian/squeeze/kdepim/debian/source/options b/debian/_base/kdepim/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdepim/debian/source/options
+++ b/debian/_base/kdepim/debian/source/options
diff --git a/debian/squeeze/kdesdk/debian/KUBUNTU-DEBIAN-CHANGES b/debian/_base/kdesdk/debian/KUBUNTU-DEBIAN-CHANGES
index d73d1b6ae..d73d1b6ae 100644
--- a/debian/squeeze/kdesdk/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/debian/_base/kdesdk/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/debian/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdesdk/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/debian/squeeze/kdesdk/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdesdk/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdesdk/debian/cdbs/kde.mk b/debian/_base/kdesdk/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/debian/squeeze/kdesdk/debian/cdbs/kde.mk
+++ b/debian/_base/kdesdk/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdesdk/debian/cdbs/versions.pl b/debian/_base/kdesdk/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdesdk/debian/cdbs/versions.pl
+++ b/debian/_base/kdesdk/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdesdk/debian/cervisia-trinity.README.Debian b/debian/_base/kdesdk/debian/cervisia-trinity.README.Debian
index d9a31b41e..d9a31b41e 100644
--- a/debian/squeeze/kdesdk/debian/cervisia-trinity.README.Debian
+++ b/debian/_base/kdesdk/debian/cervisia-trinity.README.Debian
diff --git a/debian/squeeze/kdesdk/debian/cervisia-trinity.docs b/debian/_base/kdesdk/debian/cervisia-trinity.docs
index 657c4b5eb..657c4b5eb 100644
--- a/debian/squeeze/kdesdk/debian/cervisia-trinity.docs
+++ b/debian/_base/kdesdk/debian/cervisia-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/cervisia-trinity.install b/debian/_base/kdesdk/debian/cervisia-trinity.install
index d24c82f3b..d24c82f3b 100644
--- a/debian/squeeze/kdesdk/debian/cervisia-trinity.install
+++ b/debian/_base/kdesdk/debian/cervisia-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/cervisia-trinity.lintian b/debian/_base/kdesdk/debian/cervisia-trinity.lintian
index 0037f433c..0037f433c 100644
--- a/debian/squeeze/kdesdk/debian/cervisia-trinity.lintian
+++ b/debian/_base/kdesdk/debian/cervisia-trinity.lintian
diff --git a/debian/squeeze/kdesdk/debian/cervisia-trinity.menu b/debian/_base/kdesdk/debian/cervisia-trinity.menu
index e2cbd329c..e2cbd329c 100644
--- a/debian/squeeze/kdesdk/debian/cervisia-trinity.menu
+++ b/debian/_base/kdesdk/debian/cervisia-trinity.menu
diff --git a/debian/squeeze/kdesdk/debian/changelog b/debian/_base/kdesdk/debian/changelog
index a2272cf72..a2272cf72 100644
--- a/debian/squeeze/kdesdk/debian/changelog
+++ b/debian/_base/kdesdk/debian/changelog
diff --git a/debian/squeeze/kdesdk/debian/compat b/debian/_base/kdesdk/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdesdk/debian/compat
+++ b/debian/_base/kdesdk/debian/compat
diff --git a/debian/squeeze/kdesdk/debian/control b/debian/_base/kdesdk/debian/control
index 18a3d9807..18a3d9807 100644
--- a/debian/squeeze/kdesdk/debian/control
+++ b/debian/_base/kdesdk/debian/control
diff --git a/debian/squeeze/kdesdk/debian/copyright b/debian/_base/kdesdk/debian/copyright
index 57c7c1593..57c7c1593 100644
--- a/debian/squeeze/kdesdk/debian/copyright
+++ b/debian/_base/kdesdk/debian/copyright
diff --git a/debian/squeeze/kdesdk/debian/desktop-i18n/createdesktop.pl b/debian/_base/kdesdk/debian/desktop-i18n/createdesktop.pl
index 1705e7d4f..1705e7d4f 100644
--- a/debian/squeeze/kdesdk/debian/desktop-i18n/createdesktop.pl
+++ b/debian/_base/kdesdk/debian/desktop-i18n/createdesktop.pl
diff --git a/debian/squeeze/kdesdk/debian/desktop-i18n/findfiles b/debian/_base/kdesdk/debian/desktop-i18n/findfiles
index 397948556..397948556 100644
--- a/debian/squeeze/kdesdk/debian/desktop-i18n/findfiles
+++ b/debian/_base/kdesdk/debian/desktop-i18n/findfiles
diff --git a/debian/squeeze/kdesdk/debian/desktop-i18n/msgsplit b/debian/_base/kdesdk/debian/desktop-i18n/msgsplit
index 98789a47f..98789a47f 100644
--- a/debian/squeeze/kdesdk/debian/desktop-i18n/msgsplit
+++ b/debian/_base/kdesdk/debian/desktop-i18n/msgsplit
diff --git a/debian/squeeze/kdesdk/debian/icons/catalogmanager.xpm b/debian/_base/kdesdk/debian/icons/catalogmanager.xpm
index 7e508d5f3..7e508d5f3 100644
--- a/debian/squeeze/kdesdk/debian/icons/catalogmanager.xpm
+++ b/debian/_base/kdesdk/debian/icons/catalogmanager.xpm
diff --git a/debian/squeeze/kdesdk/debian/icons/cervisia.xpm b/debian/_base/kdesdk/debian/icons/cervisia.xpm
index 9a2181402..9a2181402 100644
--- a/debian/squeeze/kdesdk/debian/icons/cervisia.xpm
+++ b/debian/_base/kdesdk/debian/icons/cervisia.xpm
diff --git a/debian/squeeze/kdesdk/debian/icons/kbabel.xpm b/debian/_base/kdesdk/debian/icons/kbabel.xpm
index e4798b899..e4798b899 100644
--- a/debian/squeeze/kdesdk/debian/icons/kbabel.xpm
+++ b/debian/_base/kdesdk/debian/icons/kbabel.xpm
diff --git a/debian/squeeze/kdesdk/debian/icons/kbabeldict.xpm b/debian/_base/kdesdk/debian/icons/kbabeldict.xpm
index c560a7381..c560a7381 100644
--- a/debian/squeeze/kdesdk/debian/icons/kbabeldict.xpm
+++ b/debian/_base/kdesdk/debian/icons/kbabeldict.xpm
diff --git a/debian/squeeze/kdesdk/debian/icons/kbugbuster.xpm b/debian/_base/kdesdk/debian/icons/kbugbuster.xpm
index 67e8cadca..67e8cadca 100644
--- a/debian/squeeze/kdesdk/debian/icons/kbugbuster.xpm
+++ b/debian/_base/kdesdk/debian/icons/kbugbuster.xpm
diff --git a/debian/squeeze/kdesdk/debian/icons/kcachegrind.xpm b/debian/_base/kdesdk/debian/icons/kcachegrind.xpm
index 843263759..843263759 100644
--- a/debian/squeeze/kdesdk/debian/icons/kcachegrind.xpm
+++ b/debian/_base/kdesdk/debian/icons/kcachegrind.xpm
diff --git a/debian/squeeze/kdesdk/debian/icons/kompare.xpm b/debian/_base/kdesdk/debian/icons/kompare.xpm
index dd0cb8995..dd0cb8995 100644
--- a/debian/squeeze/kdesdk/debian/icons/kompare.xpm
+++ b/debian/_base/kdesdk/debian/icons/kompare.xpm
diff --git a/debian/squeeze/kdesdk/debian/icons/kuiviewer.xpm b/debian/_base/kdesdk/debian/icons/kuiviewer.xpm
index 398bd6d37..398bd6d37 100644
--- a/debian/squeeze/kdesdk/debian/icons/kuiviewer.xpm
+++ b/debian/_base/kdesdk/debian/icons/kuiviewer.xpm
diff --git a/debian/squeeze/kdesdk/debian/icons/umbrello.xpm b/debian/_base/kdesdk/debian/icons/umbrello.xpm
index c8ffc2a80..c8ffc2a80 100644
--- a/debian/squeeze/kdesdk/debian/icons/umbrello.xpm
+++ b/debian/_base/kdesdk/debian/icons/umbrello.xpm
diff --git a/debian/squeeze/kdesdk/debian/kapptemplate-trinity.docs b/debian/_base/kdesdk/debian/kapptemplate-trinity.docs
index ae1eeaf96..ae1eeaf96 100644
--- a/debian/squeeze/kdesdk/debian/kapptemplate-trinity.docs
+++ b/debian/_base/kdesdk/debian/kapptemplate-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kapptemplate-trinity.install b/debian/_base/kdesdk/debian/kapptemplate-trinity.install
index a10e6654c..a10e6654c 100644
--- a/debian/squeeze/kdesdk/debian/kapptemplate-trinity.install
+++ b/debian/_base/kdesdk/debian/kapptemplate-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kapptemplate-trinity.lintian b/debian/_base/kdesdk/debian/kapptemplate-trinity.lintian
index 803257d10..803257d10 100644
--- a/debian/squeeze/kdesdk/debian/kapptemplate-trinity.lintian
+++ b/debian/_base/kdesdk/debian/kapptemplate-trinity.lintian
diff --git a/debian/squeeze/kdesdk/debian/kapptemplate-trinity.manpages b/debian/_base/kdesdk/debian/kapptemplate-trinity.manpages
index e558b802c..e558b802c 100644
--- a/debian/squeeze/kdesdk/debian/kapptemplate-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kapptemplate-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity-dev.docs b/debian/_base/kdesdk/debian/kbabel-trinity-dev.docs
index 372b1530b..372b1530b 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity-dev.docs
+++ b/debian/_base/kdesdk/debian/kbabel-trinity-dev.docs
diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity-dev.install b/debian/_base/kdesdk/debian/kbabel-trinity-dev.install
index 4c2720936..4c2720936 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity-dev.install
+++ b/debian/_base/kdesdk/debian/kbabel-trinity-dev.install
diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity.README.Debian b/debian/_base/kdesdk/debian/kbabel-trinity.README.Debian
index f4eb38546..f4eb38546 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity.README.Debian
+++ b/debian/_base/kdesdk/debian/kbabel-trinity.README.Debian
diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity.docs b/debian/_base/kdesdk/debian/kbabel-trinity.docs
index 372b1530b..372b1530b 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity.docs
+++ b/debian/_base/kdesdk/debian/kbabel-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity.install b/debian/_base/kdesdk/debian/kbabel-trinity.install
index a1b2c2cab..a1b2c2cab 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity.install
+++ b/debian/_base/kdesdk/debian/kbabel-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity.lintian b/debian/_base/kdesdk/debian/kbabel-trinity.lintian
index d2f345fca..d2f345fca 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity.lintian
+++ b/debian/_base/kdesdk/debian/kbabel-trinity.lintian
diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity.manpages b/debian/_base/kdesdk/debian/kbabel-trinity.manpages
index e85be5938..e85be5938 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kbabel-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity.menu b/debian/_base/kdesdk/debian/kbabel-trinity.menu
index 62d116d5c..62d116d5c 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity.menu
+++ b/debian/_base/kdesdk/debian/kbabel-trinity.menu
diff --git a/debian/squeeze/kdesdk/debian/kbabel-trinity.mime b/debian/_base/kdesdk/debian/kbabel-trinity.mime
index b6e1fe021..b6e1fe021 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity.mime
+++ b/debian/_base/kdesdk/debian/kbabel-trinity.mime
diff --git a/debian/squeeze/kdesdk/debian/kbugbuster-trinity.docs b/debian/_base/kdesdk/debian/kbugbuster-trinity.docs
index 94789b715..94789b715 100644
--- a/debian/squeeze/kdesdk/debian/kbugbuster-trinity.docs
+++ b/debian/_base/kdesdk/debian/kbugbuster-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kbugbuster-trinity.install b/debian/_base/kdesdk/debian/kbugbuster-trinity.install
index 80072a35e..80072a35e 100644
--- a/debian/squeeze/kdesdk/debian/kbugbuster-trinity.install
+++ b/debian/_base/kdesdk/debian/kbugbuster-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kbugbuster-trinity.manpages b/debian/_base/kdesdk/debian/kbugbuster-trinity.manpages
index 8fc558a77..8fc558a77 100644
--- a/debian/squeeze/kdesdk/debian/kbugbuster-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kbugbuster-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kbugbuster-trinity.menu b/debian/_base/kdesdk/debian/kbugbuster-trinity.menu
index 47f13168d..47f13168d 100644
--- a/debian/squeeze/kdesdk/debian/kbugbuster-trinity.menu
+++ b/debian/_base/kdesdk/debian/kbugbuster-trinity.menu
diff --git a/debian/squeeze/kdesdk/debian/kcachegrind-converters-trinity.docs b/debian/_base/kdesdk/debian/kcachegrind-converters-trinity.docs
index b19a948df..b19a948df 100644
--- a/debian/squeeze/kdesdk/debian/kcachegrind-converters-trinity.docs
+++ b/debian/_base/kdesdk/debian/kcachegrind-converters-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kcachegrind-converters-trinity.install b/debian/_base/kdesdk/debian/kcachegrind-converters-trinity.install
index 742cfc523..742cfc523 100644
--- a/debian/squeeze/kdesdk/debian/kcachegrind-converters-trinity.install
+++ b/debian/_base/kdesdk/debian/kcachegrind-converters-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kcachegrind-converters-trinity.manpages b/debian/_base/kdesdk/debian/kcachegrind-converters-trinity.manpages
index 977c48e2d..977c48e2d 100644
--- a/debian/squeeze/kdesdk/debian/kcachegrind-converters-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kcachegrind-converters-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.README.Debian b/debian/_base/kdesdk/debian/kcachegrind-trinity.README.Debian
index 3b9a9f290..3b9a9f290 100644
--- a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.README.Debian
+++ b/debian/_base/kdesdk/debian/kcachegrind-trinity.README.Debian
diff --git a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.docs b/debian/_base/kdesdk/debian/kcachegrind-trinity.docs
index aef510285..aef510285 100644
--- a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.docs
+++ b/debian/_base/kdesdk/debian/kcachegrind-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.install b/debian/_base/kdesdk/debian/kcachegrind-trinity.install
index f8607173f..f8607173f 100644
--- a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.install
+++ b/debian/_base/kdesdk/debian/kcachegrind-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.manpages b/debian/_base/kdesdk/debian/kcachegrind-trinity.manpages
index f994baff0..f994baff0 100644
--- a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kcachegrind-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.menu b/debian/_base/kdesdk/debian/kcachegrind-trinity.menu
index 83cd74714..83cd74714 100644
--- a/debian/squeeze/kdesdk/debian/kcachegrind-trinity.menu
+++ b/debian/_base/kdesdk/debian/kcachegrind-trinity.menu
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia b/debian/_base/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia
index b5d1310e3..b5d1310e3 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia
+++ b/debian/_base/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel b/debian/_base/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel
index 3921713e5..3921713e5 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel
+++ b/debian/_base/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind b/debian/_base/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
index ebe84bea2..ebe84bea2 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
+++ b/debian/_base/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello b/debian/_base/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello
index 127aaff2f..127aaff2f 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello
+++ b/debian/_base/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-kfile-plugins-trinity.install b/debian/_base/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
index 1ffa48c57..1ffa48c57 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
+++ b/debian/_base/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-kio-plugins-trinity.docs b/debian/_base/kdesdk/debian/kdesdk-kio-plugins-trinity.docs
index bd4b4c270..bd4b4c270 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-kio-plugins-trinity.docs
+++ b/debian/_base/kdesdk/debian/kdesdk-kio-plugins-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-kio-plugins-trinity.install b/debian/_base/kdesdk/debian/kdesdk-kio-plugins-trinity.install
index f3f70394c..f3f70394c 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-kio-plugins-trinity.install
+++ b/debian/_base/kdesdk/debian/kdesdk-kio-plugins-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.README.Debian b/debian/_base/kdesdk/debian/kdesdk-misc-trinity.README.Debian
index 03a08c2d0..03a08c2d0 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.README.Debian
+++ b/debian/_base/kdesdk/debian/kdesdk-misc-trinity.README.Debian
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.install b/debian/_base/kdesdk/debian/kdesdk-misc-trinity.install
index 9fbde2ecd..9fbde2ecd 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.install
+++ b/debian/_base/kdesdk/debian/kdesdk-misc-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.links b/debian/_base/kdesdk/debian/kdesdk-misc-trinity.links
index 160cea338..160cea338 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-misc-trinity.links
+++ b/debian/_base/kdesdk/debian/kdesdk-misc-trinity.links
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.README.Debian b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.README.Debian
index 7d0a6714d..7d0a6714d 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.README.Debian
+++ b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.README.Debian
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.docs b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.docs
index 490ab041d..490ab041d 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.docs
+++ b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.install b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.install
index 1afc3b33d..1afc3b33d 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.install
+++ b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.lintian b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.lintian
index 91f6885f3..91f6885f3 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.lintian
+++ b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.lintian
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.manpages b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.manpages
index 07337e200..07337e200 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kdesdk-scripts-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kdesdk-trinity.README.Debian b/debian/_base/kdesdk/debian/kdesdk-trinity.README.Debian
index 65a65a833..65a65a833 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-trinity.README.Debian
+++ b/debian/_base/kdesdk/debian/kdesdk-trinity.README.Debian
diff --git a/debian/squeeze/kdesdk/debian/kmtrace-trinity.docs b/debian/_base/kdesdk/debian/kmtrace-trinity.docs
index 44b289f0d..44b289f0d 100644
--- a/debian/squeeze/kdesdk/debian/kmtrace-trinity.docs
+++ b/debian/_base/kdesdk/debian/kmtrace-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kmtrace-trinity.install b/debian/_base/kdesdk/debian/kmtrace-trinity.install
index a163246b9..a163246b9 100644
--- a/debian/squeeze/kdesdk/debian/kmtrace-trinity.install
+++ b/debian/_base/kdesdk/debian/kmtrace-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kmtrace-trinity.manpages b/debian/_base/kdesdk/debian/kmtrace-trinity.manpages
index 92133295d..92133295d 100644
--- a/debian/squeeze/kdesdk/debian/kmtrace-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kmtrace-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kompare-trinity.docs b/debian/_base/kdesdk/debian/kompare-trinity.docs
index d8c52ac2e..d8c52ac2e 100644
--- a/debian/squeeze/kdesdk/debian/kompare-trinity.docs
+++ b/debian/_base/kdesdk/debian/kompare-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kompare-trinity.install b/debian/_base/kdesdk/debian/kompare-trinity.install
index 111ebeea1..111ebeea1 100644
--- a/debian/squeeze/kdesdk/debian/kompare-trinity.install
+++ b/debian/_base/kdesdk/debian/kompare-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kompare-trinity.lintian b/debian/_base/kdesdk/debian/kompare-trinity.lintian
index 70173c488..70173c488 100644
--- a/debian/squeeze/kdesdk/debian/kompare-trinity.lintian
+++ b/debian/_base/kdesdk/debian/kompare-trinity.lintian
diff --git a/debian/squeeze/kdesdk/debian/kompare-trinity.manpages b/debian/_base/kdesdk/debian/kompare-trinity.manpages
index acf918455..acf918455 100644
--- a/debian/squeeze/kdesdk/debian/kompare-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kompare-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kompare-trinity.menu b/debian/_base/kdesdk/debian/kompare-trinity.menu
index ddf617f34..ddf617f34 100644
--- a/debian/squeeze/kdesdk/debian/kompare-trinity.menu
+++ b/debian/_base/kdesdk/debian/kompare-trinity.menu
diff --git a/debian/squeeze/kdesdk/debian/kspy-trinity.docs b/debian/_base/kdesdk/debian/kspy-trinity.docs
index 755291441..755291441 100644
--- a/debian/squeeze/kdesdk/debian/kspy-trinity.docs
+++ b/debian/_base/kdesdk/debian/kspy-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kspy-trinity.install b/debian/_base/kdesdk/debian/kspy-trinity.install
index 12523ee90..12523ee90 100644
--- a/debian/squeeze/kdesdk/debian/kspy-trinity.install
+++ b/debian/_base/kdesdk/debian/kspy-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kspy-trinity.lintian b/debian/_base/kdesdk/debian/kspy-trinity.lintian
index 84d9c917f..84d9c917f 100644
--- a/debian/squeeze/kdesdk/debian/kspy-trinity.lintian
+++ b/debian/_base/kdesdk/debian/kspy-trinity.lintian
diff --git a/debian/squeeze/kdesdk/debian/kspy-trinity.manpages b/debian/_base/kdesdk/debian/kspy-trinity.manpages
index 34831ba91..34831ba91 100644
--- a/debian/squeeze/kdesdk/debian/kspy-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kspy-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kuiviewer-trinity.install b/debian/_base/kdesdk/debian/kuiviewer-trinity.install
index 964614988..964614988 100644
--- a/debian/squeeze/kdesdk/debian/kuiviewer-trinity.install
+++ b/debian/_base/kdesdk/debian/kuiviewer-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/kuiviewer-trinity.manpages b/debian/_base/kdesdk/debian/kuiviewer-trinity.manpages
index abcf3310b..abcf3310b 100644
--- a/debian/squeeze/kdesdk/debian/kuiviewer-trinity.manpages
+++ b/debian/_base/kdesdk/debian/kuiviewer-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/kuiviewer-trinity.menu b/debian/_base/kdesdk/debian/kuiviewer-trinity.menu
index d493d6157..d493d6157 100644
--- a/debian/squeeze/kdesdk/debian/kuiviewer-trinity.menu
+++ b/debian/_base/kdesdk/debian/kuiviewer-trinity.menu
diff --git a/debian/squeeze/kdesdk/debian/kunittest-trinity.docs b/debian/_base/kdesdk/debian/kunittest-trinity.docs
index 029481923..029481923 100644
--- a/debian/squeeze/kdesdk/debian/kunittest-trinity.docs
+++ b/debian/_base/kdesdk/debian/kunittest-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/kunittest-trinity.install b/debian/_base/kdesdk/debian/kunittest-trinity.install
index bf4cf0b5a..bf4cf0b5a 100644
--- a/debian/squeeze/kdesdk/debian/kunittest-trinity.install
+++ b/debian/_base/kdesdk/debian/kunittest-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/libcvsservice-trinity-dev.docs b/debian/_base/kdesdk/debian/libcvsservice-trinity-dev.docs
index 71e397bfc..71e397bfc 100644
--- a/debian/squeeze/kdesdk/debian/libcvsservice-trinity-dev.docs
+++ b/debian/_base/kdesdk/debian/libcvsservice-trinity-dev.docs
diff --git a/debian/squeeze/kdesdk/debian/libcvsservice-trinity-dev.install b/debian/_base/kdesdk/debian/libcvsservice-trinity-dev.install
index 7cd1252e9..7cd1252e9 100644
--- a/debian/squeeze/kdesdk/debian/libcvsservice-trinity-dev.install
+++ b/debian/_base/kdesdk/debian/libcvsservice-trinity-dev.install
diff --git a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.docs b/debian/_base/kdesdk/debian/libcvsservice0-trinity.docs
index 71e397bfc..71e397bfc 100644
--- a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.docs
+++ b/debian/_base/kdesdk/debian/libcvsservice0-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.install b/debian/_base/kdesdk/debian/libcvsservice0-trinity.install
index c1649ddd2..c1649ddd2 100644
--- a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.install
+++ b/debian/_base/kdesdk/debian/libcvsservice0-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.lintian b/debian/_base/kdesdk/debian/libcvsservice0-trinity.lintian
index 015a481a0..015a481a0 100644
--- a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.lintian
+++ b/debian/_base/kdesdk/debian/libcvsservice0-trinity.lintian
diff --git a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.manpages b/debian/_base/kdesdk/debian/libcvsservice0-trinity.manpages
index 9afa8b3e7..9afa8b3e7 100644
--- a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.manpages
+++ b/debian/_base/kdesdk/debian/libcvsservice0-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/man/adddebug.1 b/debian/_base/kdesdk/debian/man/adddebug.1
index b1380f6c9..b1380f6c9 100644
--- a/debian/squeeze/kdesdk/debian/man/adddebug.1
+++ b/debian/_base/kdesdk/debian/man/adddebug.1
diff --git a/debian/squeeze/kdesdk/debian/man/build-progress.sh.1 b/debian/_base/kdesdk/debian/man/build-progress.sh.1
index a5cfcc3ec..a5cfcc3ec 100644
--- a/debian/squeeze/kdesdk/debian/man/build-progress.sh.1
+++ b/debian/_base/kdesdk/debian/man/build-progress.sh.1
diff --git a/debian/squeeze/kdesdk/debian/man/catalogmanager.1 b/debian/_base/kdesdk/debian/man/catalogmanager.1
index 0103b556a..0103b556a 100644
--- a/debian/squeeze/kdesdk/debian/man/catalogmanager.1
+++ b/debian/_base/kdesdk/debian/man/catalogmanager.1
diff --git a/debian/squeeze/kdesdk/debian/man/cheatmake.1 b/debian/_base/kdesdk/debian/man/cheatmake.1
index 8aa455f27..8aa455f27 100644
--- a/debian/squeeze/kdesdk/debian/man/cheatmake.1
+++ b/debian/_base/kdesdk/debian/man/cheatmake.1
diff --git a/debian/squeeze/kdesdk/debian/man/create_cvsignore.1 b/debian/_base/kdesdk/debian/man/create_cvsignore.1
index a2ab70541..a2ab70541 100644
--- a/debian/squeeze/kdesdk/debian/man/create_cvsignore.1
+++ b/debian/_base/kdesdk/debian/man/create_cvsignore.1
diff --git a/debian/squeeze/kdesdk/debian/man/create_makefile.1 b/debian/_base/kdesdk/debian/man/create_makefile.1
index c8d888e7f..c8d888e7f 100644
--- a/debian/squeeze/kdesdk/debian/man/create_makefile.1
+++ b/debian/_base/kdesdk/debian/man/create_makefile.1
diff --git a/debian/squeeze/kdesdk/debian/man/create_makefiles.1 b/debian/_base/kdesdk/debian/man/create_makefiles.1
index 62ab39cfd..62ab39cfd 100644
--- a/debian/squeeze/kdesdk/debian/man/create_makefiles.1
+++ b/debian/_base/kdesdk/debian/man/create_makefiles.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvs-clean.1 b/debian/_base/kdesdk/debian/man/cvs-clean.1
index d025b000d..d025b000d 100644
--- a/debian/squeeze/kdesdk/debian/man/cvs-clean.1
+++ b/debian/_base/kdesdk/debian/man/cvs-clean.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvs2dist.1 b/debian/_base/kdesdk/debian/man/cvs2dist.1
index 3c971c734..3c971c734 100644
--- a/debian/squeeze/kdesdk/debian/man/cvs2dist.1
+++ b/debian/_base/kdesdk/debian/man/cvs2dist.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvsaskpass.1 b/debian/_base/kdesdk/debian/man/cvsaskpass.1
index eb7f02fdd..eb7f02fdd 100644
--- a/debian/squeeze/kdesdk/debian/man/cvsaskpass.1
+++ b/debian/_base/kdesdk/debian/man/cvsaskpass.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvsbackport.1 b/debian/_base/kdesdk/debian/man/cvsbackport.1
index 9e58dcc3c..9e58dcc3c 100644
--- a/debian/squeeze/kdesdk/debian/man/cvsbackport.1
+++ b/debian/_base/kdesdk/debian/man/cvsbackport.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvscheck.1 b/debian/_base/kdesdk/debian/man/cvscheck.1
index cf7576cb4..cf7576cb4 100644
--- a/debian/squeeze/kdesdk/debian/man/cvscheck.1
+++ b/debian/_base/kdesdk/debian/man/cvscheck.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvsforwardport.1 b/debian/_base/kdesdk/debian/man/cvsforwardport.1
index 8c5e00807..8c5e00807 100644
--- a/debian/squeeze/kdesdk/debian/man/cvsforwardport.1
+++ b/debian/_base/kdesdk/debian/man/cvsforwardport.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvslastchange.1 b/debian/_base/kdesdk/debian/man/cvslastchange.1
index 144d35a10..144d35a10 100644
--- a/debian/squeeze/kdesdk/debian/man/cvslastchange.1
+++ b/debian/_base/kdesdk/debian/man/cvslastchange.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvslastlog.1 b/debian/_base/kdesdk/debian/man/cvslastlog.1
index c773124b3..c773124b3 100644
--- a/debian/squeeze/kdesdk/debian/man/cvslastlog.1
+++ b/debian/_base/kdesdk/debian/man/cvslastlog.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvsrevertlast.1 b/debian/_base/kdesdk/debian/man/cvsrevertlast.1
index 0a1757ddc..0a1757ddc 100644
--- a/debian/squeeze/kdesdk/debian/man/cvsrevertlast.1
+++ b/debian/_base/kdesdk/debian/man/cvsrevertlast.1
diff --git a/debian/squeeze/kdesdk/debian/man/cvsservice.1 b/debian/_base/kdesdk/debian/man/cvsservice.1
index 11a58054b..11a58054b 100644
--- a/debian/squeeze/kdesdk/debian/man/cvsservice.1
+++ b/debian/_base/kdesdk/debian/man/cvsservice.1
diff --git a/debian/squeeze/kdesdk/debian/man/cxxmetric.1 b/debian/_base/kdesdk/debian/man/cxxmetric.1
index 4d12d0759..4d12d0759 100644
--- a/debian/squeeze/kdesdk/debian/man/cxxmetric.1
+++ b/debian/_base/kdesdk/debian/man/cxxmetric.1
diff --git a/debian/squeeze/kdesdk/debian/man/demangle.1 b/debian/_base/kdesdk/debian/man/demangle.1
index 0719fe1f4..0719fe1f4 100644
--- a/debian/squeeze/kdesdk/debian/man/demangle.1
+++ b/debian/_base/kdesdk/debian/man/demangle.1
diff --git a/debian/squeeze/kdesdk/debian/man/dprof2calltree.1 b/debian/_base/kdesdk/debian/man/dprof2calltree.1
index f1e7691a4..f1e7691a4 100644
--- a/debian/squeeze/kdesdk/debian/man/dprof2calltree.1
+++ b/debian/_base/kdesdk/debian/man/dprof2calltree.1
diff --git a/debian/squeeze/kdesdk/debian/man/extend_dmalloc.1 b/debian/_base/kdesdk/debian/man/extend_dmalloc.1
index 8bd4fcac4..8bd4fcac4 100644
--- a/debian/squeeze/kdesdk/debian/man/extend_dmalloc.1
+++ b/debian/_base/kdesdk/debian/man/extend_dmalloc.1
diff --git a/debian/squeeze/kdesdk/debian/man/extractattr.1 b/debian/_base/kdesdk/debian/man/extractattr.1
index fe223fc1f..fe223fc1f 100644
--- a/debian/squeeze/kdesdk/debian/man/extractattr.1
+++ b/debian/_base/kdesdk/debian/man/extractattr.1
diff --git a/debian/squeeze/kdesdk/debian/man/extractrc.1 b/debian/_base/kdesdk/debian/man/extractrc.1
index de8ac9546..de8ac9546 100644
--- a/debian/squeeze/kdesdk/debian/man/extractrc.1
+++ b/debian/_base/kdesdk/debian/man/extractrc.1
diff --git a/debian/squeeze/kdesdk/debian/man/findmissingcrystal.1 b/debian/_base/kdesdk/debian/man/findmissingcrystal.1
index f780c3ad0..f780c3ad0 100644
--- a/debian/squeeze/kdesdk/debian/man/findmissingcrystal.1
+++ b/debian/_base/kdesdk/debian/man/findmissingcrystal.1
diff --git a/debian/squeeze/kdesdk/debian/man/fixkdeincludes.1 b/debian/_base/kdesdk/debian/man/fixkdeincludes.1
index c7a75a2f3..c7a75a2f3 100644
--- a/debian/squeeze/kdesdk/debian/man/fixkdeincludes.1
+++ b/debian/_base/kdesdk/debian/man/fixkdeincludes.1
diff --git a/debian/squeeze/kdesdk/debian/man/fixuifiles.1 b/debian/_base/kdesdk/debian/man/fixuifiles.1
index 62ed8d738..62ed8d738 100644
--- a/debian/squeeze/kdesdk/debian/man/fixuifiles.1
+++ b/debian/_base/kdesdk/debian/man/fixuifiles.1
diff --git a/debian/squeeze/kdesdk/debian/man/hotshot2calltree.1 b/debian/_base/kdesdk/debian/man/hotshot2calltree.1
index 3b31794aa..3b31794aa 100644
--- a/debian/squeeze/kdesdk/debian/man/hotshot2calltree.1
+++ b/debian/_base/kdesdk/debian/man/hotshot2calltree.1
diff --git a/debian/squeeze/kdesdk/debian/man/kapptemplate.1 b/debian/_base/kdesdk/debian/man/kapptemplate.1
index acfcc1100..acfcc1100 100644
--- a/debian/squeeze/kdesdk/debian/man/kapptemplate.1
+++ b/debian/_base/kdesdk/debian/man/kapptemplate.1
diff --git a/debian/squeeze/kdesdk/debian/man/kbabel.1 b/debian/_base/kdesdk/debian/man/kbabel.1
index 0b8b8eae1..0b8b8eae1 100644
--- a/debian/squeeze/kdesdk/debian/man/kbabel.1
+++ b/debian/_base/kdesdk/debian/man/kbabel.1
diff --git a/debian/squeeze/kdesdk/debian/man/kbabeldict.1 b/debian/_base/kdesdk/debian/man/kbabeldict.1
index 1c267bcc9..1c267bcc9 100644
--- a/debian/squeeze/kdesdk/debian/man/kbabeldict.1
+++ b/debian/_base/kdesdk/debian/man/kbabeldict.1
diff --git a/debian/squeeze/kdesdk/debian/man/kbugbuster.1 b/debian/_base/kdesdk/debian/man/kbugbuster.1
index c16006086..c16006086 100644
--- a/debian/squeeze/kdesdk/debian/man/kbugbuster.1
+++ b/debian/_base/kdesdk/debian/man/kbugbuster.1
diff --git a/debian/squeeze/kdesdk/debian/man/kcachegrind.1 b/debian/_base/kdesdk/debian/man/kcachegrind.1
index 58b6e8bad..58b6e8bad 100644
--- a/debian/squeeze/kdesdk/debian/man/kcachegrind.1
+++ b/debian/_base/kdesdk/debian/man/kcachegrind.1
diff --git a/debian/squeeze/kdesdk/debian/man/kdedoc.1 b/debian/_base/kdesdk/debian/man/kdedoc.1
index 684a6ad47..684a6ad47 100644
--- a/debian/squeeze/kdesdk/debian/man/kdedoc.1
+++ b/debian/_base/kdesdk/debian/man/kdedoc.1
diff --git a/debian/squeeze/kdesdk/debian/man/kdekillall.1 b/debian/_base/kdesdk/debian/man/kdekillall.1
index 2a2c5c8a5..2a2c5c8a5 100644
--- a/debian/squeeze/kdesdk/debian/man/kdekillall.1
+++ b/debian/_base/kdesdk/debian/man/kdekillall.1
diff --git a/debian/squeeze/kdesdk/debian/man/kdelnk2desktop.py.1 b/debian/_base/kdesdk/debian/man/kdelnk2desktop.py.1
index cba89c7b0..cba89c7b0 100644
--- a/debian/squeeze/kdesdk/debian/man/kdelnk2desktop.py.1
+++ b/debian/_base/kdesdk/debian/man/kdelnk2desktop.py.1
diff --git a/debian/squeeze/kdesdk/debian/man/kdemangen.pl.1 b/debian/_base/kdesdk/debian/man/kdemangen.pl.1
index 0570f4f5c..0570f4f5c 100644
--- a/debian/squeeze/kdesdk/debian/man/kdemangen.pl.1
+++ b/debian/_base/kdesdk/debian/man/kdemangen.pl.1
diff --git a/debian/squeeze/kdesdk/debian/man/kminspector.1 b/debian/_base/kdesdk/debian/man/kminspector.1
index 911e890bf..911e890bf 100644
--- a/debian/squeeze/kdesdk/debian/man/kminspector.1
+++ b/debian/_base/kdesdk/debian/man/kminspector.1
diff --git a/debian/squeeze/kdesdk/debian/man/kmmatch.1 b/debian/_base/kdesdk/debian/man/kmmatch.1
index f8ceee27b..f8ceee27b 100644
--- a/debian/squeeze/kdesdk/debian/man/kmmatch.1
+++ b/debian/_base/kdesdk/debian/man/kmmatch.1
diff --git a/debian/squeeze/kdesdk/debian/man/kmtrace.1 b/debian/_base/kdesdk/debian/man/kmtrace.1
index d51644bef..d51644bef 100644
--- a/debian/squeeze/kdesdk/debian/man/kmtrace.1
+++ b/debian/_base/kdesdk/debian/man/kmtrace.1
diff --git a/debian/squeeze/kdesdk/debian/man/kompare.1 b/debian/_base/kdesdk/debian/man/kompare.1
index ab3b696c6..ab3b696c6 100644
--- a/debian/squeeze/kdesdk/debian/man/kompare.1
+++ b/debian/_base/kdesdk/debian/man/kompare.1
diff --git a/debian/squeeze/kdesdk/debian/man/kuiviewer.1 b/debian/_base/kdesdk/debian/man/kuiviewer.1
index fe57f3714..fe57f3714 100644
--- a/debian/squeeze/kdesdk/debian/man/kuiviewer.1
+++ b/debian/_base/kdesdk/debian/man/kuiviewer.1
diff --git a/debian/squeeze/kdesdk/debian/man/licensecheck.1 b/debian/_base/kdesdk/debian/man/licensecheck.1
index 541014d63..541014d63 100644
--- a/debian/squeeze/kdesdk/debian/man/licensecheck.1
+++ b/debian/_base/kdesdk/debian/man/licensecheck.1
diff --git a/debian/squeeze/kdesdk/debian/man/makeobj.1 b/debian/_base/kdesdk/debian/man/makeobj.1
index 48f8d0adb..48f8d0adb 100644
--- a/debian/squeeze/kdesdk/debian/man/makeobj.1
+++ b/debian/_base/kdesdk/debian/man/makeobj.1
diff --git a/debian/squeeze/kdesdk/debian/man/memprof2calltree.1 b/debian/_base/kdesdk/debian/man/memprof2calltree.1
index 0bd0582a3..0bd0582a3 100644
--- a/debian/squeeze/kdesdk/debian/man/memprof2calltree.1
+++ b/debian/_base/kdesdk/debian/man/memprof2calltree.1
diff --git a/debian/squeeze/kdesdk/debian/man/op2calltree.1 b/debian/_base/kdesdk/debian/man/op2calltree.1
index c81836a46..c81836a46 100644
--- a/debian/squeeze/kdesdk/debian/man/op2calltree.1
+++ b/debian/_base/kdesdk/debian/man/op2calltree.1
diff --git a/debian/squeeze/kdesdk/debian/man/package_crystalsvg.1 b/debian/_base/kdesdk/debian/man/package_crystalsvg.1
index 64e0f888c..64e0f888c 100644
--- a/debian/squeeze/kdesdk/debian/man/package_crystalsvg.1
+++ b/debian/_base/kdesdk/debian/man/package_crystalsvg.1
diff --git a/debian/squeeze/kdesdk/debian/man/png2mng.pl.1 b/debian/_base/kdesdk/debian/man/png2mng.pl.1
index cc10dd511..cc10dd511 100644
--- a/debian/squeeze/kdesdk/debian/man/png2mng.pl.1
+++ b/debian/_base/kdesdk/debian/man/png2mng.pl.1
diff --git a/debian/squeeze/kdesdk/debian/man/po2xml.1 b/debian/_base/kdesdk/debian/man/po2xml.1
index d1be83c89..d1be83c89 100644
--- a/debian/squeeze/kdesdk/debian/man/po2xml.1
+++ b/debian/_base/kdesdk/debian/man/po2xml.1
diff --git a/debian/squeeze/kdesdk/debian/man/pprof2calltree.1 b/debian/_base/kdesdk/debian/man/pprof2calltree.1
index dc80f91ad..dc80f91ad 100644
--- a/debian/squeeze/kdesdk/debian/man/pprof2calltree.1
+++ b/debian/_base/kdesdk/debian/man/pprof2calltree.1
diff --git a/debian/squeeze/kdesdk/debian/man/pruneemptydirs.1 b/debian/_base/kdesdk/debian/man/pruneemptydirs.1
index 93c33cea9..93c33cea9 100644
--- a/debian/squeeze/kdesdk/debian/man/pruneemptydirs.1
+++ b/debian/_base/kdesdk/debian/man/pruneemptydirs.1
diff --git a/debian/squeeze/kdesdk/debian/man/qtdoc.1 b/debian/_base/kdesdk/debian/man/qtdoc.1
index 1559c25b4..1559c25b4 100644
--- a/debian/squeeze/kdesdk/debian/man/qtdoc.1
+++ b/debian/_base/kdesdk/debian/man/qtdoc.1
diff --git a/debian/squeeze/kdesdk/debian/man/split2po.1 b/debian/_base/kdesdk/debian/man/split2po.1
index 4269f815b..4269f815b 100644
--- a/debian/squeeze/kdesdk/debian/man/split2po.1
+++ b/debian/_base/kdesdk/debian/man/split2po.1
diff --git a/debian/squeeze/kdesdk/debian/man/swappo.1 b/debian/_base/kdesdk/debian/man/swappo.1
index 96a6d3f94..96a6d3f94 100644
--- a/debian/squeeze/kdesdk/debian/man/swappo.1
+++ b/debian/_base/kdesdk/debian/man/swappo.1
diff --git a/debian/squeeze/kdesdk/debian/man/testkspy.1 b/debian/_base/kdesdk/debian/man/testkspy.1
index c04e00c0f..c04e00c0f 100644
--- a/debian/squeeze/kdesdk/debian/man/testkspy.1
+++ b/debian/_base/kdesdk/debian/man/testkspy.1
diff --git a/debian/squeeze/kdesdk/debian/man/transxx.1 b/debian/_base/kdesdk/debian/man/transxx.1
index f7c843fc9..f7c843fc9 100644
--- a/debian/squeeze/kdesdk/debian/man/transxx.1
+++ b/debian/_base/kdesdk/debian/man/transxx.1
diff --git a/debian/squeeze/kdesdk/debian/man/umbrello.1 b/debian/_base/kdesdk/debian/man/umbrello.1
index ab63662b9..ab63662b9 100644
--- a/debian/squeeze/kdesdk/debian/man/umbrello.1
+++ b/debian/_base/kdesdk/debian/man/umbrello.1
diff --git a/debian/squeeze/kdesdk/debian/man/xml2pot.1 b/debian/_base/kdesdk/debian/man/xml2pot.1
index d0920db54..d0920db54 100644
--- a/debian/squeeze/kdesdk/debian/man/xml2pot.1
+++ b/debian/_base/kdesdk/debian/man/xml2pot.1
diff --git a/debian/squeeze/kdesdk/debian/man/zonetab2pot.py.1 b/debian/_base/kdesdk/debian/man/zonetab2pot.py.1
index b7115ad20..b7115ad20 100644
--- a/debian/squeeze/kdesdk/debian/man/zonetab2pot.py.1
+++ b/debian/_base/kdesdk/debian/man/zonetab2pot.py.1
diff --git a/debian/squeeze/kdesdk/debian/not-installed.list b/debian/_base/kdesdk/debian/not-installed.list
index f801ede2f..f801ede2f 100644
--- a/debian/squeeze/kdesdk/debian/not-installed.list
+++ b/debian/_base/kdesdk/debian/not-installed.list
diff --git a/debian/squeeze/kdesdk/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdesdk/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdesdk/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdesdk/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdesdk/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdesdk/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdesdk/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdesdk/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdesdk/debian/patches/series b/debian/_base/kdesdk/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdesdk/debian/patches/series
+++ b/debian/_base/kdesdk/debian/patches/series
diff --git a/debian/squeeze/kdesdk/debian/poxml-trinity.README.Debian b/debian/_base/kdesdk/debian/poxml-trinity.README.Debian
index 0b5434012..0b5434012 100644
--- a/debian/squeeze/kdesdk/debian/poxml-trinity.README.Debian
+++ b/debian/_base/kdesdk/debian/poxml-trinity.README.Debian
diff --git a/debian/squeeze/kdesdk/debian/poxml-trinity.install b/debian/_base/kdesdk/debian/poxml-trinity.install
index 290c62266..290c62266 100644
--- a/debian/squeeze/kdesdk/debian/poxml-trinity.install
+++ b/debian/_base/kdesdk/debian/poxml-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/poxml-trinity.manpages b/debian/_base/kdesdk/debian/poxml-trinity.manpages
index 05e2191bf..05e2191bf 100644
--- a/debian/squeeze/kdesdk/debian/poxml-trinity.manpages
+++ b/debian/_base/kdesdk/debian/poxml-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/rules b/debian/_base/kdesdk/debian/rules
index b382ba355..b382ba355 100755
--- a/debian/squeeze/kdesdk/debian/rules
+++ b/debian/_base/kdesdk/debian/rules
diff --git a/debian/squeeze/kdesdk/debian/source/format b/debian/_base/kdesdk/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdesdk/debian/source/format
+++ b/debian/_base/kdesdk/debian/source/format
diff --git a/debian/squeeze/kdesdk/debian/source/options b/debian/_base/kdesdk/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdesdk/debian/source/options
+++ b/debian/_base/kdesdk/debian/source/options
diff --git a/debian/squeeze/kdesdk/debian/umbrello-trinity.README.Debian b/debian/_base/kdesdk/debian/umbrello-trinity.README.Debian
index 0ba895e00..0ba895e00 100644
--- a/debian/squeeze/kdesdk/debian/umbrello-trinity.README.Debian
+++ b/debian/_base/kdesdk/debian/umbrello-trinity.README.Debian
diff --git a/debian/squeeze/kdesdk/debian/umbrello-trinity.docs b/debian/_base/kdesdk/debian/umbrello-trinity.docs
index 07bf3446c..07bf3446c 100644
--- a/debian/squeeze/kdesdk/debian/umbrello-trinity.docs
+++ b/debian/_base/kdesdk/debian/umbrello-trinity.docs
diff --git a/debian/squeeze/kdesdk/debian/umbrello-trinity.install b/debian/_base/kdesdk/debian/umbrello-trinity.install
index 2ddf21a77..2ddf21a77 100644
--- a/debian/squeeze/kdesdk/debian/umbrello-trinity.install
+++ b/debian/_base/kdesdk/debian/umbrello-trinity.install
diff --git a/debian/squeeze/kdesdk/debian/umbrello-trinity.lintian b/debian/_base/kdesdk/debian/umbrello-trinity.lintian
index 17c9ba52c..17c9ba52c 100644
--- a/debian/squeeze/kdesdk/debian/umbrello-trinity.lintian
+++ b/debian/_base/kdesdk/debian/umbrello-trinity.lintian
diff --git a/debian/squeeze/kdesdk/debian/umbrello-trinity.manpages b/debian/_base/kdesdk/debian/umbrello-trinity.manpages
index 537bedefe..537bedefe 100644
--- a/debian/squeeze/kdesdk/debian/umbrello-trinity.manpages
+++ b/debian/_base/kdesdk/debian/umbrello-trinity.manpages
diff --git a/debian/squeeze/kdesdk/debian/umbrello-trinity.menu b/debian/_base/kdesdk/debian/umbrello-trinity.menu
index 1c8e990b1..1c8e990b1 100644
--- a/debian/squeeze/kdesdk/debian/umbrello-trinity.menu
+++ b/debian/_base/kdesdk/debian/umbrello-trinity.menu
diff --git a/debian/squeeze/kdetoys/debian/amor-trinity.README.Debian b/debian/_base/kdetoys/debian/amor-trinity.README.Debian
index 5572b0856..5572b0856 100644
--- a/debian/squeeze/kdetoys/debian/amor-trinity.README.Debian
+++ b/debian/_base/kdetoys/debian/amor-trinity.README.Debian
diff --git a/debian/squeeze/kdetoys/debian/amor-trinity.docs b/debian/_base/kdetoys/debian/amor-trinity.docs
index 114e58b83..114e58b83 100644
--- a/debian/squeeze/kdetoys/debian/amor-trinity.docs
+++ b/debian/_base/kdetoys/debian/amor-trinity.docs
diff --git a/debian/squeeze/kdetoys/debian/amor-trinity.install b/debian/_base/kdetoys/debian/amor-trinity.install
index 50d346773..50d346773 100644
--- a/debian/squeeze/kdetoys/debian/amor-trinity.install
+++ b/debian/_base/kdetoys/debian/amor-trinity.install
diff --git a/debian/squeeze/kdetoys/debian/amor-trinity.manpages b/debian/_base/kdetoys/debian/amor-trinity.manpages
index 715e595ce..715e595ce 100644
--- a/debian/squeeze/kdetoys/debian/amor-trinity.manpages
+++ b/debian/_base/kdetoys/debian/amor-trinity.manpages
diff --git a/debian/squeeze/kdetoys/debian/amor-trinity.menu b/debian/_base/kdetoys/debian/amor-trinity.menu
index e9e9144ca..e9e9144ca 100644
--- a/debian/squeeze/kdetoys/debian/amor-trinity.menu
+++ b/debian/_base/kdetoys/debian/amor-trinity.menu
diff --git a/debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdetoys/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/debian/squeeze/kdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdetoys/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdetoys/debian/cdbs/kde.mk b/debian/_base/kdetoys/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/debian/squeeze/kdetoys/debian/cdbs/kde.mk
+++ b/debian/_base/kdetoys/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdetoys/debian/cdbs/versions.pl b/debian/_base/kdetoys/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdetoys/debian/cdbs/versions.pl
+++ b/debian/_base/kdetoys/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdetoys/debian/changelog b/debian/_base/kdetoys/debian/changelog
index d15c14df5..d15c14df5 100644
--- a/debian/squeeze/kdetoys/debian/changelog
+++ b/debian/_base/kdetoys/debian/changelog
diff --git a/debian/squeeze/kdetoys/debian/compat b/debian/_base/kdetoys/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdetoys/debian/compat
+++ b/debian/_base/kdetoys/debian/compat
diff --git a/debian/squeeze/kdetoys/debian/control b/debian/_base/kdetoys/debian/control
index d0ef1c1e9..d0ef1c1e9 100644
--- a/debian/squeeze/kdetoys/debian/control
+++ b/debian/_base/kdetoys/debian/control
diff --git a/debian/squeeze/kdetoys/debian/copyright b/debian/_base/kdetoys/debian/copyright
index 0fbdac055..0fbdac055 100644
--- a/debian/squeeze/kdetoys/debian/copyright
+++ b/debian/_base/kdetoys/debian/copyright
diff --git a/debian/squeeze/kdetoys/debian/eyesapplet-trinity.install b/debian/_base/kdetoys/debian/eyesapplet-trinity.install
index 60e3c7b16..60e3c7b16 100644
--- a/debian/squeeze/kdetoys/debian/eyesapplet-trinity.install
+++ b/debian/_base/kdetoys/debian/eyesapplet-trinity.install
diff --git a/debian/squeeze/kdetoys/debian/fifteenapplet-trinity.install b/debian/_base/kdetoys/debian/fifteenapplet-trinity.install
index d54014b4b..d54014b4b 100644
--- a/debian/squeeze/kdetoys/debian/fifteenapplet-trinity.install
+++ b/debian/_base/kdetoys/debian/fifteenapplet-trinity.install
diff --git a/debian/squeeze/kdetoys/debian/icons/amor.xpm b/debian/_base/kdetoys/debian/icons/amor.xpm
index b3d73b366..b3d73b366 100644
--- a/debian/squeeze/kdetoys/debian/icons/amor.xpm
+++ b/debian/_base/kdetoys/debian/icons/amor.xpm
diff --git a/debian/squeeze/kdetoys/debian/icons/kodo.xpm b/debian/_base/kdetoys/debian/icons/kodo.xpm
index 8d73544a8..8d73544a8 100644
--- a/debian/squeeze/kdetoys/debian/icons/kodo.xpm
+++ b/debian/_base/kdetoys/debian/icons/kodo.xpm
diff --git a/debian/squeeze/kdetoys/debian/icons/kteatime.xpm b/debian/_base/kdetoys/debian/icons/kteatime.xpm
index d3bfd04e3..d3bfd04e3 100644
--- a/debian/squeeze/kdetoys/debian/icons/kteatime.xpm
+++ b/debian/_base/kdetoys/debian/icons/kteatime.xpm
diff --git a/debian/squeeze/kdetoys/debian/icons/ktux.xpm b/debian/_base/kdetoys/debian/icons/ktux.xpm
index 1067dd22a..1067dd22a 100644
--- a/debian/squeeze/kdetoys/debian/icons/ktux.xpm
+++ b/debian/_base/kdetoys/debian/icons/ktux.xpm
diff --git a/debian/squeeze/kdetoys/debian/icons/kworldclock.xpm b/debian/_base/kdetoys/debian/icons/kworldclock.xpm
index cee61a9a5..cee61a9a5 100644
--- a/debian/squeeze/kdetoys/debian/icons/kworldclock.xpm
+++ b/debian/_base/kdetoys/debian/icons/kworldclock.xpm
diff --git a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.amor b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.amor
index b4b9634b6..b4b9634b6 100644
--- a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.amor
+++ b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.amor
diff --git a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon
index a05e482b6..a05e482b6 100644
--- a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon
+++ b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon
diff --git a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kodo b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kodo
index a59297a0f..a59297a0f 100644
--- a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kodo
+++ b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kodo
diff --git a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime
index 86b8601e8..86b8601e8 100644
--- a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime
+++ b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime
diff --git a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kweather b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kweather
index 01fd7e68e..01fd7e68e 100644
--- a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kweather
+++ b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kweather
diff --git a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock
index 00fa1290b..00fa1290b 100644
--- a/debian/squeeze/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock
+++ b/debian/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock
diff --git a/debian/squeeze/kdetoys/debian/kdetoys-trinity.README.Debian b/debian/_base/kdetoys/debian/kdetoys-trinity.README.Debian
index 5dd67c1e8..5dd67c1e8 100644
--- a/debian/squeeze/kdetoys/debian/kdetoys-trinity.README.Debian
+++ b/debian/_base/kdetoys/debian/kdetoys-trinity.README.Debian
diff --git a/debian/squeeze/kdetoys/debian/kmoon-trinity.README.Debian b/debian/_base/kdetoys/debian/kmoon-trinity.README.Debian
index 3c73a9827..3c73a9827 100644
--- a/debian/squeeze/kdetoys/debian/kmoon-trinity.README.Debian
+++ b/debian/_base/kdetoys/debian/kmoon-trinity.README.Debian
diff --git a/debian/squeeze/kdetoys/debian/kmoon-trinity.docs b/debian/_base/kdetoys/debian/kmoon-trinity.docs
index be1167729..be1167729 100644
--- a/debian/squeeze/kdetoys/debian/kmoon-trinity.docs
+++ b/debian/_base/kdetoys/debian/kmoon-trinity.docs
diff --git a/debian/squeeze/kdetoys/debian/kmoon-trinity.install b/debian/_base/kdetoys/debian/kmoon-trinity.install
index 818d57926..818d57926 100644
--- a/debian/squeeze/kdetoys/debian/kmoon-trinity.install
+++ b/debian/_base/kdetoys/debian/kmoon-trinity.install
diff --git a/debian/squeeze/kdetoys/debian/kodo-trinity.README.Debian b/debian/_base/kdetoys/debian/kodo-trinity.README.Debian
index 39b677649..39b677649 100644
--- a/debian/squeeze/kdetoys/debian/kodo-trinity.README.Debian
+++ b/debian/_base/kdetoys/debian/kodo-trinity.README.Debian
diff --git a/debian/squeeze/kdetoys/debian/kodo-trinity.install b/debian/_base/kdetoys/debian/kodo-trinity.install
index e3563ae4c..e3563ae4c 100644
--- a/debian/squeeze/kdetoys/debian/kodo-trinity.install
+++ b/debian/_base/kdetoys/debian/kodo-trinity.install
diff --git a/debian/squeeze/kdetoys/debian/kodo-trinity.manpages b/debian/_base/kdetoys/debian/kodo-trinity.manpages
index 8c05387cb..8c05387cb 100644
--- a/debian/squeeze/kdetoys/debian/kodo-trinity.manpages
+++ b/debian/_base/kdetoys/debian/kodo-trinity.manpages
diff --git a/debian/squeeze/kdetoys/debian/kodo-trinity.menu b/debian/_base/kdetoys/debian/kodo-trinity.menu
index f9017ae75..f9017ae75 100644
--- a/debian/squeeze/kdetoys/debian/kodo-trinity.menu
+++ b/debian/_base/kdetoys/debian/kodo-trinity.menu
diff --git a/debian/squeeze/kdetoys/debian/kteatime-trinity.README.Debian b/debian/_base/kdetoys/debian/kteatime-trinity.README.Debian
index 972e574e3..972e574e3 100644
--- a/debian/squeeze/kdetoys/debian/kteatime-trinity.README.Debian
+++ b/debian/_base/kdetoys/debian/kteatime-trinity.README.Debian
diff --git a/debian/squeeze/kdetoys/debian/kteatime-trinity.docs b/debian/_base/kdetoys/debian/kteatime-trinity.docs
index 30b44fbbd..30b44fbbd 100644
--- a/debian/squeeze/kdetoys/debian/kteatime-trinity.docs
+++ b/debian/_base/kdetoys/debian/kteatime-trinity.docs
diff --git a/debian/squeeze/kdetoys/debian/kteatime-trinity.install b/debian/_base/kdetoys/debian/kteatime-trinity.install
index dcf1742c4..dcf1742c4 100644
--- a/debian/squeeze/kdetoys/debian/kteatime-trinity.install
+++ b/debian/_base/kdetoys/debian/kteatime-trinity.install
diff --git a/debian/squeeze/kdetoys/debian/kteatime-trinity.manpages b/debian/_base/kdetoys/debian/kteatime-trinity.manpages
index 1ee95dba6..1ee95dba6 100644
--- a/debian/squeeze/kdetoys/debian/kteatime-trinity.manpages
+++ b/debian/_base/kdetoys/debian/kteatime-trinity.manpages
diff --git a/debian/squeeze/kdetoys/debian/kteatime-trinity.menu b/debian/_base/kdetoys/debian/kteatime-trinity.menu
index c0c53fcde..c0c53fcde 100644
--- a/debian/squeeze/kdetoys/debian/kteatime-trinity.menu
+++ b/debian/_base/kdetoys/debian/kteatime-trinity.menu
diff --git a/debian/squeeze/kdetoys/debian/ktux-trinity.docs b/debian/_base/kdetoys/debian/ktux-trinity.docs
index 1b5212f4a..1b5212f4a 100644
--- a/debian/squeeze/kdetoys/debian/ktux-trinity.docs
+++ b/debian/_base/kdetoys/debian/ktux-trinity.docs
diff --git a/debian/squeeze/kdetoys/debian/ktux-trinity.install b/debian/_base/kdetoys/debian/ktux-trinity.install
index e602a0125..e602a0125 100644
--- a/debian/squeeze/kdetoys/debian/ktux-trinity.install
+++ b/debian/_base/kdetoys/debian/ktux-trinity.install
diff --git a/debian/squeeze/kdetoys/debian/ktux-trinity.manpages b/debian/_base/kdetoys/debian/ktux-trinity.manpages
index 80aaacf1a..80aaacf1a 100644
--- a/debian/squeeze/kdetoys/debian/ktux-trinity.manpages
+++ b/debian/_base/kdetoys/debian/ktux-trinity.manpages
diff --git a/debian/squeeze/kdetoys/debian/ktux-trinity.menu b/debian/_base/kdetoys/debian/ktux-trinity.menu
index 9e6c517a8..9e6c517a8 100644
--- a/debian/squeeze/kdetoys/debian/ktux-trinity.menu
+++ b/debian/_base/kdetoys/debian/ktux-trinity.menu
diff --git a/debian/squeeze/kdetoys/debian/kweather-trinity.README.Debian b/debian/_base/kdetoys/debian/kweather-trinity.README.Debian
index 815ca9c50..815ca9c50 100644
--- a/debian/squeeze/kdetoys/debian/kweather-trinity.README.Debian
+++ b/debian/_base/kdetoys/debian/kweather-trinity.README.Debian
diff --git a/debian/squeeze/kdetoys/debian/kweather-trinity.docs b/debian/_base/kdetoys/debian/kweather-trinity.docs
index 30669d601..30669d601 100644
--- a/debian/squeeze/kdetoys/debian/kweather-trinity.docs
+++ b/debian/_base/kdetoys/debian/kweather-trinity.docs
diff --git a/debian/squeeze/kdetoys/debian/kweather-trinity.install b/debian/_base/kdetoys/debian/kweather-trinity.install
index 767bf0dc2..767bf0dc2 100644
--- a/debian/squeeze/kdetoys/debian/kweather-trinity.install
+++ b/debian/_base/kdetoys/debian/kweather-trinity.install
diff --git a/debian/squeeze/kdetoys/debian/kweather-trinity.lintian b/debian/_base/kdetoys/debian/kweather-trinity.lintian
index adb549884..adb549884 100644
--- a/debian/squeeze/kdetoys/debian/kweather-trinity.lintian
+++ b/debian/_base/kdetoys/debian/kweather-trinity.lintian
diff --git a/debian/squeeze/kdetoys/debian/kweather-trinity.manpages b/debian/_base/kdetoys/debian/kweather-trinity.manpages
index d4c1b98bb..d4c1b98bb 100644
--- a/debian/squeeze/kdetoys/debian/kweather-trinity.manpages
+++ b/debian/_base/kdetoys/debian/kweather-trinity.manpages
diff --git a/debian/squeeze/kdetoys/debian/kworldclock-trinity.README.Debian b/debian/_base/kdetoys/debian/kworldclock-trinity.README.Debian
index 4824666ae..4824666ae 100644
--- a/debian/squeeze/kdetoys/debian/kworldclock-trinity.README.Debian
+++ b/debian/_base/kdetoys/debian/kworldclock-trinity.README.Debian
diff --git a/debian/squeeze/kdetoys/debian/kworldclock-trinity.install b/debian/_base/kdetoys/debian/kworldclock-trinity.install
index ba9a38321..ba9a38321 100644
--- a/debian/squeeze/kdetoys/debian/kworldclock-trinity.install
+++ b/debian/_base/kdetoys/debian/kworldclock-trinity.install
diff --git a/debian/squeeze/kdetoys/debian/kworldclock-trinity.manpages b/debian/_base/kdetoys/debian/kworldclock-trinity.manpages
index 114028079..114028079 100644
--- a/debian/squeeze/kdetoys/debian/kworldclock-trinity.manpages
+++ b/debian/_base/kdetoys/debian/kworldclock-trinity.manpages
diff --git a/debian/squeeze/kdetoys/debian/kworldclock-trinity.menu b/debian/_base/kdetoys/debian/kworldclock-trinity.menu
index 127766bf5..127766bf5 100644
--- a/debian/squeeze/kdetoys/debian/kworldclock-trinity.menu
+++ b/debian/_base/kdetoys/debian/kworldclock-trinity.menu
diff --git a/debian/squeeze/kdetoys/debian/kworldclock-trinity.postinst b/debian/_base/kdetoys/debian/kworldclock-trinity.postinst
index 9e2c0df3e..9e2c0df3e 100644
--- a/debian/squeeze/kdetoys/debian/kworldclock-trinity.postinst
+++ b/debian/_base/kdetoys/debian/kworldclock-trinity.postinst
diff --git a/debian/squeeze/kdetoys/debian/kworldclock-trinity.prerm b/debian/_base/kdetoys/debian/kworldclock-trinity.prerm
index b31a8a6ad..b31a8a6ad 100644
--- a/debian/squeeze/kdetoys/debian/kworldclock-trinity.prerm
+++ b/debian/_base/kdetoys/debian/kworldclock-trinity.prerm
diff --git a/debian/squeeze/kdetoys/debian/man/amor-trinity.1 b/debian/_base/kdetoys/debian/man/amor-trinity.1
index b381c3293..b381c3293 100644
--- a/debian/squeeze/kdetoys/debian/man/amor-trinity.1
+++ b/debian/_base/kdetoys/debian/man/amor-trinity.1
diff --git a/debian/squeeze/kdetoys/debian/man/kodo-trinity.1 b/debian/_base/kdetoys/debian/man/kodo-trinity.1
index 940f71987..940f71987 100644
--- a/debian/squeeze/kdetoys/debian/man/kodo-trinity.1
+++ b/debian/_base/kdetoys/debian/man/kodo-trinity.1
diff --git a/debian/squeeze/kdetoys/debian/man/kteatime-trinity.1 b/debian/_base/kdetoys/debian/man/kteatime-trinity.1
index 09b73bee4..09b73bee4 100644
--- a/debian/squeeze/kdetoys/debian/man/kteatime-trinity.1
+++ b/debian/_base/kdetoys/debian/man/kteatime-trinity.1
diff --git a/debian/squeeze/kdetoys/debian/man/ktux-trinity.1 b/debian/_base/kdetoys/debian/man/ktux-trinity.1
index bb26dc867..bb26dc867 100644
--- a/debian/squeeze/kdetoys/debian/man/ktux-trinity.1
+++ b/debian/_base/kdetoys/debian/man/ktux-trinity.1
diff --git a/debian/squeeze/kdetoys/debian/man/kweatherreport-trinity.1 b/debian/_base/kdetoys/debian/man/kweatherreport-trinity.1
index 1d6834ca0..1d6834ca0 100644
--- a/debian/squeeze/kdetoys/debian/man/kweatherreport-trinity.1
+++ b/debian/_base/kdetoys/debian/man/kweatherreport-trinity.1
diff --git a/debian/squeeze/kdetoys/debian/man/kweatherservice-trinity.1 b/debian/_base/kdetoys/debian/man/kweatherservice-trinity.1
index 86cfc499f..86cfc499f 100644
--- a/debian/squeeze/kdetoys/debian/man/kweatherservice-trinity.1
+++ b/debian/_base/kdetoys/debian/man/kweatherservice-trinity.1
diff --git a/debian/squeeze/kdetoys/debian/man/kworldclock-trinity.1 b/debian/_base/kdetoys/debian/man/kworldclock-trinity.1
index 29fa63a9b..29fa63a9b 100644
--- a/debian/squeeze/kdetoys/debian/man/kworldclock-trinity.1
+++ b/debian/_base/kdetoys/debian/man/kworldclock-trinity.1
diff --git a/debian/squeeze/kdetoys/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdetoys/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdetoys/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdetoys/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdetoys/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdetoys/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdetoys/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdetoys/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdetoys/debian/patches/series b/debian/_base/kdetoys/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdetoys/debian/patches/series
+++ b/debian/_base/kdetoys/debian/patches/series
diff --git a/debian/squeeze/kdetoys/debian/rules b/debian/_base/kdetoys/debian/rules
index 96f3778ee..96f3778ee 100755
--- a/debian/squeeze/kdetoys/debian/rules
+++ b/debian/_base/kdetoys/debian/rules
diff --git a/debian/squeeze/kdetoys/debian/source/format b/debian/_base/kdetoys/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdetoys/debian/source/format
+++ b/debian/_base/kdetoys/debian/source/format
diff --git a/debian/squeeze/kdetoys/debian/source/options b/debian/_base/kdetoys/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdetoys/debian/source/options
+++ b/debian/_base/kdetoys/debian/source/options
diff --git a/debian/squeeze/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 2a0aadb8d..2a0aadb8d 100644
--- a/debian/squeeze/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdeutils/debian/ark-trinity-trinity.lintian b/debian/_base/kdeutils/debian/ark-trinity-trinity.lintian
index c4771fe04..c4771fe04 100644
--- a/debian/squeeze/kdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/_base/kdeutils/debian/ark-trinity-trinity.lintian
diff --git a/debian/squeeze/kdeutils/debian/ark-trinity.install b/debian/_base/kdeutils/debian/ark-trinity.install
index b8aceed9b..b8aceed9b 100644
--- a/debian/squeeze/kdeutils/debian/ark-trinity.install
+++ b/debian/_base/kdeutils/debian/ark-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/ark-trinity.manpages b/debian/_base/kdeutils/debian/ark-trinity.manpages
index 37ed04716..37ed04716 100644
--- a/debian/squeeze/kdeutils/debian/ark-trinity.manpages
+++ b/debian/_base/kdeutils/debian/ark-trinity.manpages
diff --git a/debian/squeeze/kdeutils/debian/ark-trinity.menu b/debian/_base/kdeutils/debian/ark-trinity.menu
index e6d567e2e..e6d567e2e 100644
--- a/debian/squeeze/kdeutils/debian/ark-trinity.menu
+++ b/debian/_base/kdeutils/debian/ark-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/ark-trinity.mime b/debian/_base/kdeutils/debian/ark-trinity.mime
index a46ab8432..a46ab8432 100644
--- a/debian/squeeze/kdeutils/debian/ark-trinity.mime
+++ b/debian/_base/kdeutils/debian/ark-trinity.mime
diff --git a/debian/squeeze/kdeutils/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdeutils/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/debian/squeeze/kdeutils/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdeutils/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdeutils/debian/cdbs/kde.mk b/debian/_base/kdeutils/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/debian/squeeze/kdeutils/debian/cdbs/kde.mk
+++ b/debian/_base/kdeutils/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdeutils/debian/cdbs/versions.pl b/debian/_base/kdeutils/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdeutils/debian/cdbs/versions.pl
+++ b/debian/_base/kdeutils/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdeutils/debian/changelog b/debian/_base/kdeutils/debian/changelog
index 0835dfb62..0835dfb62 100644
--- a/debian/squeeze/kdeutils/debian/changelog
+++ b/debian/_base/kdeutils/debian/changelog
diff --git a/debian/squeeze/kdeutils/debian/compat b/debian/_base/kdeutils/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdeutils/debian/compat
+++ b/debian/_base/kdeutils/debian/compat
diff --git a/debian/squeeze/kdeutils/debian/control b/debian/_base/kdeutils/debian/control
index 519dc9e5a..519dc9e5a 100644
--- a/debian/squeeze/kdeutils/debian/control
+++ b/debian/_base/kdeutils/debian/control
diff --git a/debian/squeeze/kdeutils/debian/copyright b/debian/_base/kdeutils/debian/copyright
index f1f81fe64..f1f81fe64 100644
--- a/debian/squeeze/kdeutils/debian/copyright
+++ b/debian/_base/kdeutils/debian/copyright
diff --git a/debian/squeeze/kdeutils/debian/icons/ark-16.xpm b/debian/_base/kdeutils/debian/icons/ark-16.xpm
index 4a5e3da20..4a5e3da20 100644
--- a/debian/squeeze/kdeutils/debian/icons/ark-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/ark-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/ark.xpm b/debian/_base/kdeutils/debian/icons/ark.xpm
index 4210cd20c..4210cd20c 100644
--- a/debian/squeeze/kdeutils/debian/icons/ark.xpm
+++ b/debian/_base/kdeutils/debian/icons/ark.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kcalc-16.xpm b/debian/_base/kdeutils/debian/icons/kcalc-16.xpm
index 96b3358af..96b3358af 100644
--- a/debian/squeeze/kdeutils/debian/icons/kcalc-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/kcalc-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kcalc.xpm b/debian/_base/kdeutils/debian/icons/kcalc.xpm
index 99b79e585..99b79e585 100644
--- a/debian/squeeze/kdeutils/debian/icons/kcalc.xpm
+++ b/debian/_base/kdeutils/debian/icons/kcalc.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kcharselect-16.xpm b/debian/_base/kdeutils/debian/icons/kcharselect-16.xpm
index 37eea509a..37eea509a 100644
--- a/debian/squeeze/kdeutils/debian/icons/kcharselect-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/kcharselect-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kcharselect.xpm b/debian/_base/kdeutils/debian/icons/kcharselect.xpm
index 4d3187509..4d3187509 100644
--- a/debian/squeeze/kdeutils/debian/icons/kcharselect.xpm
+++ b/debian/_base/kdeutils/debian/icons/kcharselect.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kdf-16.xpm b/debian/_base/kdeutils/debian/icons/kdf-16.xpm
index e9f074b42..e9f074b42 100644
--- a/debian/squeeze/kdeutils/debian/icons/kdf-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/kdf-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kdf.xpm b/debian/_base/kdeutils/debian/icons/kdf.xpm
index b4c9d470a..b4c9d470a 100644
--- a/debian/squeeze/kdeutils/debian/icons/kdf.xpm
+++ b/debian/_base/kdeutils/debian/icons/kdf.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kedit-16.xpm b/debian/_base/kdeutils/debian/icons/kedit-16.xpm
index d5d2e7cfb..d5d2e7cfb 100644
--- a/debian/squeeze/kdeutils/debian/icons/kedit-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/kedit-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kedit.xpm b/debian/_base/kdeutils/debian/icons/kedit.xpm
index 5f973d166..5f973d166 100644
--- a/debian/squeeze/kdeutils/debian/icons/kedit.xpm
+++ b/debian/_base/kdeutils/debian/icons/kedit.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kfloppy-16.xpm b/debian/_base/kdeutils/debian/icons/kfloppy-16.xpm
index bfea0ec17..bfea0ec17 100644
--- a/debian/squeeze/kdeutils/debian/icons/kfloppy-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/kfloppy-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kfloppy.xpm b/debian/_base/kdeutils/debian/icons/kfloppy.xpm
index facf97162..facf97162 100644
--- a/debian/squeeze/kdeutils/debian/icons/kfloppy.xpm
+++ b/debian/_base/kdeutils/debian/icons/kfloppy.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kgpg-16.xpm b/debian/_base/kdeutils/debian/icons/kgpg-16.xpm
index 7388264e5..7388264e5 100644
--- a/debian/squeeze/kdeutils/debian/icons/kgpg-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/kgpg-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kgpg.xpm b/debian/_base/kdeutils/debian/icons/kgpg.xpm
index 8f1a3dcf0..8f1a3dcf0 100644
--- a/debian/squeeze/kdeutils/debian/icons/kgpg.xpm
+++ b/debian/_base/kdeutils/debian/icons/kgpg.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/khexedit-16.xpm b/debian/_base/kdeutils/debian/icons/khexedit-16.xpm
index d0134aa3e..d0134aa3e 100644
--- a/debian/squeeze/kdeutils/debian/icons/khexedit-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/khexedit-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/khexedit.xpm b/debian/_base/kdeutils/debian/icons/khexedit.xpm
index 06bd1a274..06bd1a274 100644
--- a/debian/squeeze/kdeutils/debian/icons/khexedit.xpm
+++ b/debian/_base/kdeutils/debian/icons/khexedit.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kjots-16.xpm b/debian/_base/kdeutils/debian/icons/kjots-16.xpm
index a94206162..a94206162 100644
--- a/debian/squeeze/kdeutils/debian/icons/kjots-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/kjots-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kjots.xpm b/debian/_base/kdeutils/debian/icons/kjots.xpm
index ff080d32e..ff080d32e 100644
--- a/debian/squeeze/kdeutils/debian/icons/kjots.xpm
+++ b/debian/_base/kdeutils/debian/icons/kjots.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kregexpeditor-16.xpm b/debian/_base/kdeutils/debian/icons/kregexpeditor-16.xpm
index bfd3d835d..bfd3d835d 100644
--- a/debian/squeeze/kdeutils/debian/icons/kregexpeditor-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/kregexpeditor-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kregexpeditor.xpm b/debian/_base/kdeutils/debian/icons/kregexpeditor.xpm
index a81cf60c6..a81cf60c6 100644
--- a/debian/squeeze/kdeutils/debian/icons/kregexpeditor.xpm
+++ b/debian/_base/kdeutils/debian/icons/kregexpeditor.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/ktimer-16.xpm b/debian/_base/kdeutils/debian/icons/ktimer-16.xpm
index f0c857680..f0c857680 100644
--- a/debian/squeeze/kdeutils/debian/icons/ktimer-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/ktimer-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/ktimer.xpm b/debian/_base/kdeutils/debian/icons/ktimer.xpm
index 4f08fe0fc..4f08fe0fc 100644
--- a/debian/squeeze/kdeutils/debian/icons/ktimer.xpm
+++ b/debian/_base/kdeutils/debian/icons/ktimer.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kwikdisk-16.xpm b/debian/_base/kdeutils/debian/icons/kwikdisk-16.xpm
index e861b0b34..e861b0b34 100644
--- a/debian/squeeze/kdeutils/debian/icons/kwikdisk-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/kwikdisk-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/kwikdisk.xpm b/debian/_base/kdeutils/debian/icons/kwikdisk.xpm
index 4521b420a..4521b420a 100644
--- a/debian/squeeze/kdeutils/debian/icons/kwikdisk.xpm
+++ b/debian/_base/kdeutils/debian/icons/kwikdisk.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/superkaramba-16.xpm b/debian/_base/kdeutils/debian/icons/superkaramba-16.xpm
index edb9db936..edb9db936 100644
--- a/debian/squeeze/kdeutils/debian/icons/superkaramba-16.xpm
+++ b/debian/_base/kdeutils/debian/icons/superkaramba-16.xpm
diff --git a/debian/squeeze/kdeutils/debian/icons/superkaramba.xpm b/debian/_base/kdeutils/debian/icons/superkaramba.xpm
index c4f096556..c4f096556 100644
--- a/debian/squeeze/kdeutils/debian/icons/superkaramba.xpm
+++ b/debian/_base/kdeutils/debian/icons/superkaramba.xpm
diff --git a/debian/squeeze/kdeutils/debian/kcalc-trinity-trinity.lintian b/debian/_base/kdeutils/debian/kcalc-trinity-trinity.lintian
index 4e3ff01ab..4e3ff01ab 100644
--- a/debian/squeeze/kdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/_base/kdeutils/debian/kcalc-trinity-trinity.lintian
diff --git a/debian/squeeze/kdeutils/debian/kcalc-trinity.install b/debian/_base/kdeutils/debian/kcalc-trinity.install
index cf2881698..cf2881698 100644
--- a/debian/squeeze/kdeutils/debian/kcalc-trinity.install
+++ b/debian/_base/kdeutils/debian/kcalc-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kcalc-trinity.manpages b/debian/_base/kdeutils/debian/kcalc-trinity.manpages
index ee2f0ad0a..ee2f0ad0a 100644
--- a/debian/squeeze/kdeutils/debian/kcalc-trinity.manpages
+++ b/debian/_base/kdeutils/debian/kcalc-trinity.manpages
diff --git a/debian/squeeze/kdeutils/debian/kcalc-trinity.menu b/debian/_base/kdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..146e4b1fb 100644
--- a/debian/squeeze/kdeutils/debian/kcalc-trinity.menu
+++ b/debian/_base/kdeutils/debian/kcalc-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/kcharselect-trinity.install b/debian/_base/kdeutils/debian/kcharselect-trinity.install
index a18296be0..a18296be0 100644
--- a/debian/squeeze/kdeutils/debian/kcharselect-trinity.install
+++ b/debian/_base/kdeutils/debian/kcharselect-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kcharselect-trinity.manpages b/debian/_base/kdeutils/debian/kcharselect-trinity.manpages
index 6a1e28fb7..6a1e28fb7 100644
--- a/debian/squeeze/kdeutils/debian/kcharselect-trinity.manpages
+++ b/debian/_base/kdeutils/debian/kcharselect-trinity.manpages
diff --git a/debian/squeeze/kdeutils/debian/kcharselect-trinity.menu b/debian/_base/kdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..59a49f72d 100644
--- a/debian/squeeze/kdeutils/debian/kcharselect-trinity.menu
+++ b/debian/_base/kdeutils/debian/kcharselect-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/kdelirc-trinity.install b/debian/_base/kdeutils/debian/kdelirc-trinity.install
index a1ee8b7ed..a1ee8b7ed 100644
--- a/debian/squeeze/kdeutils/debian/kdelirc-trinity.install
+++ b/debian/_base/kdeutils/debian/kdelirc-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kdelirc-trinity.lintian b/debian/_base/kdeutils/debian/kdelirc-trinity.lintian
index 51b260d6a..51b260d6a 100644
--- a/debian/squeeze/kdeutils/debian/kdelirc-trinity.lintian
+++ b/debian/_base/kdeutils/debian/kdelirc-trinity.lintian
diff --git a/debian/squeeze/kdeutils/debian/kdessh-trinity.install b/debian/_base/kdeutils/debian/kdessh-trinity.install
index f5b56dd0d..f5b56dd0d 100644
--- a/debian/squeeze/kdeutils/debian/kdessh-trinity.install
+++ b/debian/_base/kdeutils/debian/kdessh-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.ark b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.ark
index 0285ce94e..0285ce94e 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.ark
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.ark
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.irkick b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.irkick
index e5b1a6d9d..e5b1a6d9d 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.irkick
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.irkick
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc
index f99892cbe..f99892cbe 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc
index a359eecc2..a359eecc2 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kdf b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kdf
index 4d96a3307..4d96a3307 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kdf
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kdf
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kedit b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kedit
index f4d03d484..f4d03d484 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kedit
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kedit
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy
index 1d524873d..1d524873d 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg
index 686a275a3..686a275a3 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit
index f30866d09..f30866d09 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kjots b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kjots
index 2813b5727..2813b5727 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kjots
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kjots
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor
index 80ff56094..80ff56094 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet
index e83203abd..e83203abd 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba
index 1b20e103b..1b20e103b 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba
+++ b/debian/_base/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-trinity-dev.install b/debian/_base/kdeutils/debian/kdeutils-trinity-dev.install
index 4ac477602..4ac477602 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-trinity-dev.install
+++ b/debian/_base/kdeutils/debian/kdeutils-trinity-dev.install
diff --git a/debian/squeeze/kdeutils/debian/kdeutils-trinity-doc.install b/debian/_base/kdeutils/debian/kdeutils-trinity-doc.install
index 290c9ebe8..290c9ebe8 100644
--- a/debian/squeeze/kdeutils/debian/kdeutils-trinity-doc.install
+++ b/debian/_base/kdeutils/debian/kdeutils-trinity-doc.install
diff --git a/debian/squeeze/kdeutils/debian/kdf-trinity.install b/debian/_base/kdeutils/debian/kdf-trinity.install
index 074e2f7f8..074e2f7f8 100644
--- a/debian/squeeze/kdeutils/debian/kdf-trinity.install
+++ b/debian/_base/kdeutils/debian/kdf-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kdf-trinity.manpages b/debian/_base/kdeutils/debian/kdf-trinity.manpages
index ac5e86975..ac5e86975 100644
--- a/debian/squeeze/kdeutils/debian/kdf-trinity.manpages
+++ b/debian/_base/kdeutils/debian/kdf-trinity.manpages
diff --git a/debian/squeeze/kdeutils/debian/kdf-trinity.menu b/debian/_base/kdeutils/debian/kdf-trinity.menu
index 7edf7e1c1..7edf7e1c1 100644
--- a/debian/squeeze/kdeutils/debian/kdf-trinity.menu
+++ b/debian/_base/kdeutils/debian/kdf-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/kedit-trinity.install b/debian/_base/kdeutils/debian/kedit-trinity.install
index e17c3fb17..e17c3fb17 100644
--- a/debian/squeeze/kdeutils/debian/kedit-trinity.install
+++ b/debian/_base/kdeutils/debian/kedit-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kedit-trinity.lintian b/debian/_base/kdeutils/debian/kedit-trinity.lintian
index 232253503..232253503 100644
--- a/debian/squeeze/kdeutils/debian/kedit-trinity.lintian
+++ b/debian/_base/kdeutils/debian/kedit-trinity.lintian
diff --git a/debian/squeeze/kdeutils/debian/kedit-trinity.manpages b/debian/_base/kdeutils/debian/kedit-trinity.manpages
index 84374715a..84374715a 100644
--- a/debian/squeeze/kdeutils/debian/kedit-trinity.manpages
+++ b/debian/_base/kdeutils/debian/kedit-trinity.manpages
diff --git a/debian/squeeze/kdeutils/debian/kedit-trinity.menu b/debian/_base/kdeutils/debian/kedit-trinity.menu
index a22b486b0..a22b486b0 100644
--- a/debian/squeeze/kdeutils/debian/kedit-trinity.menu
+++ b/debian/_base/kdeutils/debian/kedit-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/kedit-trinity.mime b/debian/_base/kdeutils/debian/kedit-trinity.mime
index 966a4bb90..966a4bb90 100644
--- a/debian/squeeze/kdeutils/debian/kedit-trinity.mime
+++ b/debian/_base/kdeutils/debian/kedit-trinity.mime
diff --git a/debian/squeeze/kdeutils/debian/kfloppy-trinity.install b/debian/_base/kdeutils/debian/kfloppy-trinity.install
index 25738bfa0..25738bfa0 100644
--- a/debian/squeeze/kdeutils/debian/kfloppy-trinity.install
+++ b/debian/_base/kdeutils/debian/kfloppy-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kfloppy-trinity.manpages b/debian/_base/kdeutils/debian/kfloppy-trinity.manpages
index 02c1ea86f..02c1ea86f 100644
--- a/debian/squeeze/kdeutils/debian/kfloppy-trinity.manpages
+++ b/debian/_base/kdeutils/debian/kfloppy-trinity.manpages
diff --git a/debian/squeeze/kdeutils/debian/kfloppy-trinity.menu b/debian/_base/kdeutils/debian/kfloppy-trinity.menu
index 33faffe31..33faffe31 100644
--- a/debian/squeeze/kdeutils/debian/kfloppy-trinity.menu
+++ b/debian/_base/kdeutils/debian/kfloppy-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/kgpg-trinity.install b/debian/_base/kdeutils/debian/kgpg-trinity.install
index 26605d453..26605d453 100644
--- a/debian/squeeze/kdeutils/debian/kgpg-trinity.install
+++ b/debian/_base/kdeutils/debian/kgpg-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kgpg-trinity.manpages b/debian/_base/kdeutils/debian/kgpg-trinity.manpages
index 111b73663..111b73663 100644
--- a/debian/squeeze/kdeutils/debian/kgpg-trinity.manpages
+++ b/debian/_base/kdeutils/debian/kgpg-trinity.manpages
diff --git a/debian/squeeze/kdeutils/debian/kgpg-trinity.menu b/debian/_base/kdeutils/debian/kgpg-trinity.menu
index 533bb9117..533bb9117 100644
--- a/debian/squeeze/kdeutils/debian/kgpg-trinity.menu
+++ b/debian/_base/kdeutils/debian/kgpg-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/khexedit-trinity.install b/debian/_base/kdeutils/debian/khexedit-trinity.install
index d48280fed..d48280fed 100644
--- a/debian/squeeze/kdeutils/debian/khexedit-trinity.install
+++ b/debian/_base/kdeutils/debian/khexedit-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/khexedit-trinity.manpages b/debian/_base/kdeutils/debian/khexedit-trinity.manpages
index 41235ebfd..41235ebfd 100644
--- a/debian/squeeze/kdeutils/debian/khexedit-trinity.manpages
+++ b/debian/_base/kdeutils/debian/khexedit-trinity.manpages
diff --git a/debian/squeeze/kdeutils/debian/khexedit-trinity.menu b/debian/_base/kdeutils/debian/khexedit-trinity.menu
index 7e75828dc..7e75828dc 100644
--- a/debian/squeeze/kdeutils/debian/khexedit-trinity.menu
+++ b/debian/_base/kdeutils/debian/khexedit-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/kjots-trinity.install b/debian/_base/kdeutils/debian/kjots-trinity.install
index 8b117e0b5..8b117e0b5 100644
--- a/debian/squeeze/kdeutils/debian/kjots-trinity.install
+++ b/debian/_base/kdeutils/debian/kjots-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kjots-trinity.menu b/debian/_base/kdeutils/debian/kjots-trinity.menu
index c303fa2f4..c303fa2f4 100644
--- a/debian/squeeze/kdeutils/debian/kjots-trinity.menu
+++ b/debian/_base/kdeutils/debian/kjots-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/klaptopdaemon-trinity.install b/debian/_base/kdeutils/debian/klaptopdaemon-trinity.install
index 3e9d1af18..3e9d1af18 100644
--- a/debian/squeeze/kdeutils/debian/klaptopdaemon-trinity.install
+++ b/debian/_base/kdeutils/debian/klaptopdaemon-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/klaptopdaemon-trinity.prerm b/debian/_base/kdeutils/debian/klaptopdaemon-trinity.prerm
index ecc9ea389..ecc9ea389 100644
--- a/debian/squeeze/kdeutils/debian/klaptopdaemon-trinity.prerm
+++ b/debian/_base/kdeutils/debian/klaptopdaemon-trinity.prerm
diff --git a/debian/squeeze/kdeutils/debian/klaptopdaemon.README.Debian b/debian/_base/kdeutils/debian/klaptopdaemon.README.Debian
index d6cf29558..d6cf29558 100644
--- a/debian/squeeze/kdeutils/debian/klaptopdaemon.README.Debian
+++ b/debian/_base/kdeutils/debian/klaptopdaemon.README.Debian
diff --git a/debian/squeeze/kdeutils/debian/kmilo-legacy-trinity.install b/debian/_base/kdeutils/debian/kmilo-legacy-trinity.install
index 9cc04b20c..9cc04b20c 100644
--- a/debian/squeeze/kdeutils/debian/kmilo-legacy-trinity.install
+++ b/debian/_base/kdeutils/debian/kmilo-legacy-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kmilo-trinity.install b/debian/_base/kdeutils/debian/kmilo-trinity.install
index 1d5b8cb8f..1d5b8cb8f 100644
--- a/debian/squeeze/kdeutils/debian/kmilo-trinity.install
+++ b/debian/_base/kdeutils/debian/kmilo-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kregexpeditor-trinity.install b/debian/_base/kdeutils/debian/kregexpeditor-trinity.install
index ddb0d489f..ddb0d489f 100644
--- a/debian/squeeze/kdeutils/debian/kregexpeditor-trinity.install
+++ b/debian/_base/kdeutils/debian/kregexpeditor-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/kregexpeditor-trinity.menu b/debian/_base/kdeutils/debian/kregexpeditor-trinity.menu
index 3c95d33ec..3c95d33ec 100644
--- a/debian/squeeze/kdeutils/debian/kregexpeditor-trinity.menu
+++ b/debian/_base/kdeutils/debian/kregexpeditor-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/ksim-trinity.install b/debian/_base/kdeutils/debian/ksim-trinity.install
index c1d00aefc..c1d00aefc 100644
--- a/debian/squeeze/kdeutils/debian/ksim-trinity.install
+++ b/debian/_base/kdeutils/debian/ksim-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/ksim-trinity.preinst b/debian/_base/kdeutils/debian/ksim-trinity.preinst
index 71c296dca..71c296dca 100644
--- a/debian/squeeze/kdeutils/debian/ksim-trinity.preinst
+++ b/debian/_base/kdeutils/debian/ksim-trinity.preinst
diff --git a/debian/squeeze/kdeutils/debian/ktimer-trinity.install b/debian/_base/kdeutils/debian/ktimer-trinity.install
index abebef83d..abebef83d 100644
--- a/debian/squeeze/kdeutils/debian/ktimer-trinity.install
+++ b/debian/_base/kdeutils/debian/ktimer-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/ktimer-trinity.menu b/debian/_base/kdeutils/debian/ktimer-trinity.menu
index f120b78df..f120b78df 100644
--- a/debian/squeeze/kdeutils/debian/ktimer-trinity.menu
+++ b/debian/_base/kdeutils/debian/ktimer-trinity.menu
diff --git a/debian/squeeze/kdeutils/debian/kwalletmanager-trinity.install b/debian/_base/kdeutils/debian/kwalletmanager-trinity.install
index 250eb2390..250eb2390 100644
--- a/debian/squeeze/kdeutils/debian/kwalletmanager-trinity.install
+++ b/debian/_base/kdeutils/debian/kwalletmanager-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/man/ark-trinity.1 b/debian/_base/kdeutils/debian/man/ark-trinity.1
index f15b77b33..f15b77b33 100644
--- a/debian/squeeze/kdeutils/debian/man/ark-trinity.1
+++ b/debian/_base/kdeutils/debian/man/ark-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/man/kcalc-trinity.1 b/debian/_base/kdeutils/debian/man/kcalc-trinity.1
index d84088327..d84088327 100644
--- a/debian/squeeze/kdeutils/debian/man/kcalc-trinity.1
+++ b/debian/_base/kdeutils/debian/man/kcalc-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/man/kcharselect-trinity.1 b/debian/_base/kdeutils/debian/man/kcharselect-trinity.1
index bc0fb442b..bc0fb442b 100644
--- a/debian/squeeze/kdeutils/debian/man/kcharselect-trinity.1
+++ b/debian/_base/kdeutils/debian/man/kcharselect-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/man/kdf-trinity.1 b/debian/_base/kdeutils/debian/man/kdf-trinity.1
index 50cabade4..50cabade4 100644
--- a/debian/squeeze/kdeutils/debian/man/kdf-trinity.1
+++ b/debian/_base/kdeutils/debian/man/kdf-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/man/kedit-trinity.1 b/debian/_base/kdeutils/debian/man/kedit-trinity.1
index 26dafcbbd..26dafcbbd 100644
--- a/debian/squeeze/kdeutils/debian/man/kedit-trinity.1
+++ b/debian/_base/kdeutils/debian/man/kedit-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/man/kfloppy-trinity.1 b/debian/_base/kdeutils/debian/man/kfloppy-trinity.1
index b2b26a248..b2b26a248 100644
--- a/debian/squeeze/kdeutils/debian/man/kfloppy-trinity.1
+++ b/debian/_base/kdeutils/debian/man/kfloppy-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/man/kgpg-trinity.1 b/debian/_base/kdeutils/debian/man/kgpg-trinity.1
index 113143963..113143963 100644
--- a/debian/squeeze/kdeutils/debian/man/kgpg-trinity.1
+++ b/debian/_base/kdeutils/debian/man/kgpg-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/man/khexedit-trinity.1 b/debian/_base/kdeutils/debian/man/khexedit-trinity.1
index c77a34699..c77a34699 100644
--- a/debian/squeeze/kdeutils/debian/man/khexedit-trinity.1
+++ b/debian/_base/kdeutils/debian/man/khexedit-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/man/kwikdisk-trinity.1 b/debian/_base/kdeutils/debian/man/kwikdisk-trinity.1
index 15e727db6..15e727db6 100644
--- a/debian/squeeze/kdeutils/debian/man/kwikdisk-trinity.1
+++ b/debian/_base/kdeutils/debian/man/kwikdisk-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/man/superkaramba-trinity.1 b/debian/_base/kdeutils/debian/man/superkaramba-trinity.1
index 134761ea5..134761ea5 100644
--- a/debian/squeeze/kdeutils/debian/man/superkaramba-trinity.1
+++ b/debian/_base/kdeutils/debian/man/superkaramba-trinity.1
diff --git a/debian/squeeze/kdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/debian/_base/kdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
index 485164ebe..485164ebe 100644
--- a/debian/squeeze/kdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
+++ b/debian/_base/kdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
diff --git a/debian/squeeze/kdeutils/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdeutils/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdeutils/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdeutils/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdeutils/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdeutils/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdeutils/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdeutils/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdeutils/debian/patches/series b/debian/_base/kdeutils/debian/patches/series
index f4421a4c2..f4421a4c2 100644
--- a/debian/squeeze/kdeutils/debian/patches/series
+++ b/debian/_base/kdeutils/debian/patches/series
diff --git a/debian/squeeze/kdeutils/debian/rules b/debian/_base/kdeutils/debian/rules
index cdb529f2e..cdb529f2e 100755
--- a/debian/squeeze/kdeutils/debian/rules
+++ b/debian/_base/kdeutils/debian/rules
diff --git a/debian/squeeze/kdeutils/debian/source/format b/debian/_base/kdeutils/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdeutils/debian/source/format
+++ b/debian/_base/kdeutils/debian/source/format
diff --git a/debian/squeeze/kdeutils/debian/source/options b/debian/_base/kdeutils/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdeutils/debian/source/options
+++ b/debian/_base/kdeutils/debian/source/options
diff --git a/debian/squeeze/kdeutils/debian/superkaramba-trinity.examples b/debian/_base/kdeutils/debian/superkaramba-trinity.examples
index c02a032d2..c02a032d2 100644
--- a/debian/squeeze/kdeutils/debian/superkaramba-trinity.examples
+++ b/debian/_base/kdeutils/debian/superkaramba-trinity.examples
diff --git a/debian/squeeze/kdeutils/debian/superkaramba-trinity.install b/debian/_base/kdeutils/debian/superkaramba-trinity.install
index 12daea5ba..12daea5ba 100644
--- a/debian/squeeze/kdeutils/debian/superkaramba-trinity.install
+++ b/debian/_base/kdeutils/debian/superkaramba-trinity.install
diff --git a/debian/squeeze/kdeutils/debian/superkaramba-trinity.manpages b/debian/_base/kdeutils/debian/superkaramba-trinity.manpages
index 730ac7f62..730ac7f62 100644
--- a/debian/squeeze/kdeutils/debian/superkaramba-trinity.manpages
+++ b/debian/_base/kdeutils/debian/superkaramba-trinity.manpages
diff --git a/debian/squeeze/kdeutils/debian/superkaramba-trinity.menu b/debian/_base/kdeutils/debian/superkaramba-trinity.menu
index 1a03b78dd..1a03b78dd 100644
--- a/debian/squeeze/kdeutils/debian/superkaramba-trinity.menu
+++ b/debian/_base/kdeutils/debian/superkaramba-trinity.menu
diff --git a/debian/squeeze/kdevelop.cmake/debian/README.Debian b/debian/_base/kdevelop.cmake/debian/README.Debian
index ca17bc626..ca17bc626 100644
--- a/debian/squeeze/kdevelop.cmake/debian/README.Debian
+++ b/debian/_base/kdevelop.cmake/debian/README.Debian
diff --git a/debian/squeeze/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index 4f2bfd93d..4f2bfd93d 100644
--- a/debian/squeeze/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdevelop.cmake/debian/cdbs/kde.mk b/debian/_base/kdevelop.cmake/debian/cdbs/kde.mk
index 6c6a346c4..6c6a346c4 100644
--- a/debian/squeeze/kdevelop.cmake/debian/cdbs/kde.mk
+++ b/debian/_base/kdevelop.cmake/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdevelop.cmake/debian/cdbs/versions.pl b/debian/_base/kdevelop.cmake/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/debian/squeeze/kdevelop.cmake/debian/cdbs/versions.pl
+++ b/debian/_base/kdevelop.cmake/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdevelop.cmake/debian/changelog b/debian/_base/kdevelop.cmake/debian/changelog
index d37ad0e8d..d37ad0e8d 100644
--- a/debian/squeeze/kdevelop.cmake/debian/changelog
+++ b/debian/_base/kdevelop.cmake/debian/changelog
diff --git a/debian/squeeze/kdevelop.cmake/debian/compat b/debian/_base/kdevelop.cmake/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/debian/squeeze/kdevelop.cmake/debian/compat
+++ b/debian/_base/kdevelop.cmake/debian/compat
diff --git a/debian/squeeze/kdevelop.cmake/debian/control b/debian/_base/kdevelop.cmake/debian/control
index aba698abb..aba698abb 100644
--- a/debian/squeeze/kdevelop.cmake/debian/control
+++ b/debian/_base/kdevelop.cmake/debian/control
diff --git a/debian/squeeze/kdevelop.cmake/debian/copyright b/debian/_base/kdevelop.cmake/debian/copyright
index d967b6c07..d967b6c07 100644
--- a/debian/squeeze/kdevelop.cmake/debian/copyright
+++ b/debian/_base/kdevelop.cmake/debian/copyright
diff --git a/debian/squeeze/kdevelop.cmake/debian/kdevelop-data-trinity.install b/debian/_base/kdevelop.cmake/debian/kdevelop-data-trinity.install
index 70e2f0ebc..70e2f0ebc 100644
--- a/debian/squeeze/kdevelop.cmake/debian/kdevelop-data-trinity.install
+++ b/debian/_base/kdevelop.cmake/debian/kdevelop-data-trinity.install
diff --git a/debian/squeeze/kdevelop.cmake/debian/kdevelop-data-trinity.lintian b/debian/_base/kdevelop.cmake/debian/kdevelop-data-trinity.lintian
index 7fae2cfa6..7fae2cfa6 100644
--- a/debian/squeeze/kdevelop.cmake/debian/kdevelop-data-trinity.lintian
+++ b/debian/_base/kdevelop.cmake/debian/kdevelop-data-trinity.lintian
diff --git a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity-dev.install b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity-dev.install
index 5c24ba5bb..5c24ba5bb 100644
--- a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity-dev.install
+++ b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity-dev.install
diff --git a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity-doc.install b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity-doc.install
index e14858a44..e14858a44 100644
--- a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity-doc.install
+++ b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity-doc.install
diff --git a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity.install b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity.install
index 0c92940b2..0c92940b2 100644
--- a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity.install
+++ b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity.install
diff --git a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity.manpages b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity.manpages
index b5d676453..b5d676453 100644
--- a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity.manpages
+++ b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity.manpages
diff --git a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity.menu b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity.menu
index 7f40efdc4..7f40efdc4 100644
--- a/debian/squeeze/kdevelop.cmake/debian/kdevelop-trinity.menu
+++ b/debian/_base/kdevelop.cmake/debian/kdevelop-trinity.menu
diff --git a/debian/squeeze/kdevelop.cmake/debian/kdevelop.xpm b/debian/_base/kdevelop.cmake/debian/kdevelop.xpm
index 348a95692..348a95692 100644
--- a/debian/squeeze/kdevelop.cmake/debian/kdevelop.xpm
+++ b/debian/_base/kdevelop.cmake/debian/kdevelop.xpm
diff --git a/debian/squeeze/kdevelop.cmake/debian/man/kdeopt.part b/debian/_base/kdevelop.cmake/debian/man/kdeopt.part
index d258f0ad1..d258f0ad1 100644
--- a/debian/squeeze/kdevelop.cmake/debian/man/kdeopt.part
+++ b/debian/_base/kdevelop.cmake/debian/man/kdeopt.part
diff --git a/debian/squeeze/kdevelop.cmake/debian/man/kdevassistant.man b/debian/_base/kdevelop.cmake/debian/man/kdevassistant.man
index 7eadfe937..7eadfe937 100644
--- a/debian/squeeze/kdevelop.cmake/debian/man/kdevassistant.man
+++ b/debian/_base/kdevelop.cmake/debian/man/kdevassistant.man
diff --git a/debian/squeeze/kdevelop.cmake/debian/man/kdevdesigner.man b/debian/_base/kdevelop.cmake/debian/man/kdevdesigner.man
index e200ff117..e200ff117 100644
--- a/debian/squeeze/kdevelop.cmake/debian/man/kdevdesigner.man
+++ b/debian/_base/kdevelop.cmake/debian/man/kdevdesigner.man
diff --git a/debian/squeeze/kdevelop.cmake/debian/man/kdevelop-htdig.man b/debian/_base/kdevelop.cmake/debian/man/kdevelop-htdig.man
index b917bdcdf..b917bdcdf 100644
--- a/debian/squeeze/kdevelop.cmake/debian/man/kdevelop-htdig.man
+++ b/debian/_base/kdevelop.cmake/debian/man/kdevelop-htdig.man
diff --git a/debian/squeeze/kdevelop.cmake/debian/man/kdevelop.man b/debian/_base/kdevelop.cmake/debian/man/kdevelop.man
index dc54b591c..dc54b591c 100644
--- a/debian/squeeze/kdevelop.cmake/debian/man/kdevelop.man
+++ b/debian/_base/kdevelop.cmake/debian/man/kdevelop.man
diff --git a/debian/squeeze/kdevelop.cmake/debian/man/kdevprj2kdevelop.man b/debian/_base/kdevelop.cmake/debian/man/kdevprj2kdevelop.man
index 1a499963d..1a499963d 100644
--- a/debian/squeeze/kdevelop.cmake/debian/man/kdevprj2kdevelop.man
+++ b/debian/_base/kdevelop.cmake/debian/man/kdevprj2kdevelop.man
diff --git a/debian/squeeze/kdevelop.cmake/debian/man/kdevprofileeditor.man b/debian/_base/kdevelop.cmake/debian/man/kdevprofileeditor.man
index 40e8692e7..40e8692e7 100644
--- a/debian/squeeze/kdevelop.cmake/debian/man/kdevprofileeditor.man
+++ b/debian/_base/kdevelop.cmake/debian/man/kdevprofileeditor.man
diff --git a/debian/squeeze/kdevelop.cmake/debian/patches/.gitignore b/debian/_base/kdevelop.cmake/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/kdevelop.cmake/debian/patches/.gitignore
+++ b/debian/_base/kdevelop.cmake/debian/patches/.gitignore
diff --git a/debian/squeeze/kdevelop.cmake/debian/rules b/debian/_base/kdevelop.cmake/debian/rules
index 0a2fc3911..0a2fc3911 100755
--- a/debian/squeeze/kdevelop.cmake/debian/rules
+++ b/debian/_base/kdevelop.cmake/debian/rules
diff --git a/debian/squeeze/kdevelop.cmake/debian/source.lintian-overrides b/debian/_base/kdevelop.cmake/debian/source.lintian-overrides
index f74fddc6e..f74fddc6e 100644
--- a/debian/squeeze/kdevelop.cmake/debian/source.lintian-overrides
+++ b/debian/_base/kdevelop.cmake/debian/source.lintian-overrides
diff --git a/debian/squeeze/kdevelop.cmake/debian/watch b/debian/_base/kdevelop.cmake/debian/watch
index bbf94d39c..bbf94d39c 100644
--- a/debian/squeeze/kdevelop.cmake/debian/watch
+++ b/debian/_base/kdevelop.cmake/debian/watch
diff --git a/debian/squeeze/kdevelop/debian/README.Debian b/debian/_base/kdevelop/debian/README.Debian
index ca17bc626..ca17bc626 100644
--- a/debian/squeeze/kdevelop/debian/README.Debian
+++ b/debian/_base/kdevelop/debian/README.Debian
diff --git a/debian/squeeze/kdevelop/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdevelop/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/debian/squeeze/kdevelop/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdevelop/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdevelop/debian/cdbs/kde.mk b/debian/_base/kdevelop/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/debian/squeeze/kdevelop/debian/cdbs/kde.mk
+++ b/debian/_base/kdevelop/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdevelop/debian/cdbs/versions.pl b/debian/_base/kdevelop/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdevelop/debian/cdbs/versions.pl
+++ b/debian/_base/kdevelop/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdevelop/debian/changelog b/debian/_base/kdevelop/debian/changelog
index d37ad0e8d..d37ad0e8d 100644
--- a/debian/squeeze/kdevelop/debian/changelog
+++ b/debian/_base/kdevelop/debian/changelog
diff --git a/debian/squeeze/kdevelop/debian/compat b/debian/_base/kdevelop/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdevelop/debian/compat
+++ b/debian/_base/kdevelop/debian/compat
diff --git a/debian/squeeze/kdevelop/debian/control b/debian/_base/kdevelop/debian/control
index 6dd1f0a24..6dd1f0a24 100644
--- a/debian/squeeze/kdevelop/debian/control
+++ b/debian/_base/kdevelop/debian/control
diff --git a/debian/squeeze/kdevelop/debian/copyright b/debian/_base/kdevelop/debian/copyright
index d967b6c07..d967b6c07 100644
--- a/debian/squeeze/kdevelop/debian/copyright
+++ b/debian/_base/kdevelop/debian/copyright
diff --git a/debian/squeeze/kdevelop/debian/kdevelop-data-trinity.install b/debian/_base/kdevelop/debian/kdevelop-data-trinity.install
index 70e2f0ebc..70e2f0ebc 100644
--- a/debian/squeeze/kdevelop/debian/kdevelop-data-trinity.install
+++ b/debian/_base/kdevelop/debian/kdevelop-data-trinity.install
diff --git a/debian/squeeze/kdevelop/debian/kdevelop-data-trinity.lintian b/debian/_base/kdevelop/debian/kdevelop-data-trinity.lintian
index a78623689..a78623689 100644
--- a/debian/squeeze/kdevelop/debian/kdevelop-data-trinity.lintian
+++ b/debian/_base/kdevelop/debian/kdevelop-data-trinity.lintian
diff --git a/debian/squeeze/kdevelop/debian/kdevelop-trinity-dev.install b/debian/_base/kdevelop/debian/kdevelop-trinity-dev.install
index a8813a5e2..a8813a5e2 100644
--- a/debian/squeeze/kdevelop/debian/kdevelop-trinity-dev.install
+++ b/debian/_base/kdevelop/debian/kdevelop-trinity-dev.install
diff --git a/debian/squeeze/kdevelop/debian/kdevelop-trinity-doc.install b/debian/_base/kdevelop/debian/kdevelop-trinity-doc.install
index 09ea4d8b8..09ea4d8b8 100644
--- a/debian/squeeze/kdevelop/debian/kdevelop-trinity-doc.install
+++ b/debian/_base/kdevelop/debian/kdevelop-trinity-doc.install
diff --git a/debian/squeeze/kdevelop/debian/kdevelop-trinity.install b/debian/_base/kdevelop/debian/kdevelop-trinity.install
index 0c92940b2..0c92940b2 100644
--- a/debian/squeeze/kdevelop/debian/kdevelop-trinity.install
+++ b/debian/_base/kdevelop/debian/kdevelop-trinity.install
diff --git a/debian/squeeze/kdevelop/debian/kdevelop-trinity.manpages b/debian/_base/kdevelop/debian/kdevelop-trinity.manpages
index b5d676453..b5d676453 100644
--- a/debian/squeeze/kdevelop/debian/kdevelop-trinity.manpages
+++ b/debian/_base/kdevelop/debian/kdevelop-trinity.manpages
diff --git a/debian/squeeze/kdevelop/debian/kdevelop-trinity.menu b/debian/_base/kdevelop/debian/kdevelop-trinity.menu
index 7f40efdc4..7f40efdc4 100644
--- a/debian/squeeze/kdevelop/debian/kdevelop-trinity.menu
+++ b/debian/_base/kdevelop/debian/kdevelop-trinity.menu
diff --git a/debian/squeeze/kdevelop/debian/kdevelop.xpm b/debian/_base/kdevelop/debian/kdevelop.xpm
index 348a95692..348a95692 100644
--- a/debian/squeeze/kdevelop/debian/kdevelop.xpm
+++ b/debian/_base/kdevelop/debian/kdevelop.xpm
diff --git a/debian/squeeze/kdevelop/debian/man/kdeopt.part b/debian/_base/kdevelop/debian/man/kdeopt.part
index d258f0ad1..d258f0ad1 100644
--- a/debian/squeeze/kdevelop/debian/man/kdeopt.part
+++ b/debian/_base/kdevelop/debian/man/kdeopt.part
diff --git a/debian/squeeze/kdevelop/debian/man/kdevassistant.man b/debian/_base/kdevelop/debian/man/kdevassistant.man
index 7eadfe937..7eadfe937 100644
--- a/debian/squeeze/kdevelop/debian/man/kdevassistant.man
+++ b/debian/_base/kdevelop/debian/man/kdevassistant.man
diff --git a/debian/squeeze/kdevelop/debian/man/kdevdesigner.man b/debian/_base/kdevelop/debian/man/kdevdesigner.man
index e200ff117..e200ff117 100644
--- a/debian/squeeze/kdevelop/debian/man/kdevdesigner.man
+++ b/debian/_base/kdevelop/debian/man/kdevdesigner.man
diff --git a/debian/squeeze/kdevelop/debian/man/kdevelop-htdig.man b/debian/_base/kdevelop/debian/man/kdevelop-htdig.man
index b917bdcdf..b917bdcdf 100644
--- a/debian/squeeze/kdevelop/debian/man/kdevelop-htdig.man
+++ b/debian/_base/kdevelop/debian/man/kdevelop-htdig.man
diff --git a/debian/squeeze/kdevelop/debian/man/kdevelop.man b/debian/_base/kdevelop/debian/man/kdevelop.man
index dc54b591c..dc54b591c 100644
--- a/debian/squeeze/kdevelop/debian/man/kdevelop.man
+++ b/debian/_base/kdevelop/debian/man/kdevelop.man
diff --git a/debian/squeeze/kdevelop/debian/man/kdevprj2kdevelop.man b/debian/_base/kdevelop/debian/man/kdevprj2kdevelop.man
index 1a499963d..1a499963d 100644
--- a/debian/squeeze/kdevelop/debian/man/kdevprj2kdevelop.man
+++ b/debian/_base/kdevelop/debian/man/kdevprj2kdevelop.man
diff --git a/debian/squeeze/kdevelop/debian/man/kdevprofileeditor.man b/debian/_base/kdevelop/debian/man/kdevprofileeditor.man
index 40e8692e7..40e8692e7 100644
--- a/debian/squeeze/kdevelop/debian/man/kdevprofileeditor.man
+++ b/debian/_base/kdevelop/debian/man/kdevprofileeditor.man
diff --git a/debian/squeeze/kdevelop/debian/patches/common/04_am_maintainer_mode.diff b/debian/_base/kdevelop/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/debian/squeeze/kdevelop/debian/patches/common/04_am_maintainer_mode.diff
+++ b/debian/_base/kdevelop/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/debian/squeeze/kdevelop/debian/patches/common/06_disable_no_undefined.diff b/debian/_base/kdevelop/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/debian/squeeze/kdevelop/debian/patches/common/06_disable_no_undefined.diff
+++ b/debian/_base/kdevelop/debian/patches/common/06_disable_no_undefined.diff
diff --git a/debian/squeeze/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/debian/squeeze/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdevelop/debian/patches/series b/debian/_base/kdevelop/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/debian/squeeze/kdevelop/debian/patches/series
+++ b/debian/_base/kdevelop/debian/patches/series
diff --git a/debian/squeeze/kdevelop/debian/rules b/debian/_base/kdevelop/debian/rules
index 38fbd86d7..38fbd86d7 100755
--- a/debian/squeeze/kdevelop/debian/rules
+++ b/debian/_base/kdevelop/debian/rules
diff --git a/debian/squeeze/kdevelop/debian/source.lintian-overrides b/debian/_base/kdevelop/debian/source.lintian-overrides
index f74fddc6e..f74fddc6e 100644
--- a/debian/squeeze/kdevelop/debian/source.lintian-overrides
+++ b/debian/_base/kdevelop/debian/source.lintian-overrides
diff --git a/debian/squeeze/kdevelop/debian/source/format b/debian/_base/kdevelop/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdevelop/debian/source/format
+++ b/debian/_base/kdevelop/debian/source/format
diff --git a/debian/squeeze/kdevelop/debian/source/options b/debian/_base/kdevelop/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdevelop/debian/source/options
+++ b/debian/_base/kdevelop/debian/source/options
diff --git a/debian/squeeze/kdevelop/debian/watch b/debian/_base/kdevelop/debian/watch
index bbf94d39c..bbf94d39c 100644
--- a/debian/squeeze/kdevelop/debian/watch
+++ b/debian/_base/kdevelop/debian/watch
diff --git a/debian/squeeze/kdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES b/debian/_base/kdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
index a81b1de92..a81b1de92 100644
--- a/debian/squeeze/kdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/debian/_base/kdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/debian/squeeze/kdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/_base/kdewebdev/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/debian/squeeze/kdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/kdewebdev/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/kdewebdev/debian/cdbs/kde.mk b/debian/_base/kdewebdev/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/kdewebdev/debian/cdbs/kde.mk
+++ b/debian/_base/kdewebdev/debian/cdbs/kde.mk
diff --git a/debian/squeeze/kdewebdev/debian/cdbs/versions.pl b/debian/_base/kdewebdev/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/kdewebdev/debian/cdbs/versions.pl
+++ b/debian/_base/kdewebdev/debian/cdbs/versions.pl
diff --git a/debian/squeeze/kdewebdev/debian/changelog b/debian/_base/kdewebdev/debian/changelog
index c7032ecda..c7032ecda 100644
--- a/debian/squeeze/kdewebdev/debian/changelog
+++ b/debian/_base/kdewebdev/debian/changelog
diff --git a/debian/squeeze/kdewebdev/debian/compat b/debian/_base/kdewebdev/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/kdewebdev/debian/compat
+++ b/debian/_base/kdewebdev/debian/compat
diff --git a/debian/squeeze/kdewebdev/debian/control b/debian/_base/kdewebdev/debian/control
index f9b046795..f9b046795 100644
--- a/debian/squeeze/kdewebdev/debian/control
+++ b/debian/_base/kdewebdev/debian/control
diff --git a/debian/squeeze/kdewebdev/debian/copyright b/debian/_base/kdewebdev/debian/copyright
index f0f4e2f07..f0f4e2f07 100644
--- a/debian/squeeze/kdewebdev/debian/copyright
+++ b/debian/_base/kdewebdev/debian/copyright
diff --git a/debian/squeeze/kdewebdev/debian/docrc/css.docrc b/debian/_base/kdewebdev/debian/docrc/css.docrc
index c5c04681f..c5c04681f 100644
--- a/debian/squeeze/kdewebdev/debian/docrc/css.docrc
+++ b/debian/_base/kdewebdev/debian/docrc/css.docrc
diff --git a/debian/squeeze/kdewebdev/debian/docrc/docbook.docrc b/debian/_base/kdewebdev/debian/docrc/docbook.docrc
index 41a1a6c3b..41a1a6c3b 100644
--- a/debian/squeeze/kdewebdev/debian/docrc/docbook.docrc
+++ b/debian/_base/kdewebdev/debian/docrc/docbook.docrc
diff --git a/debian/squeeze/kdewebdev/debian/docrc/html.docrc b/debian/_base/kdewebdev/debian/docrc/html.docrc
index f0d051751..f0d051751 100644
--- a/debian/squeeze/kdewebdev/debian/docrc/html.docrc
+++ b/debian/_base/kdewebdev/debian/docrc/html.docrc
diff --git a/debian/squeeze/kdewebdev/debian/docrc/php.docrc b/debian/_base/kdewebdev/debian/docrc/php.docrc
index db48827d4..db48827d4 100644
--- a/debian/squeeze/kdewebdev/debian/docrc/php.docrc
+++ b/debian/_base/kdewebdev/debian/docrc/php.docrc
diff --git a/debian/squeeze/kdewebdev/debian/icons/kimagemapeditor.xpm b/debian/_base/kdewebdev/debian/icons/kimagemapeditor.xpm
index 8a24150d2..8a24150d2 100644
--- a/debian/squeeze/kdewebdev/debian/icons/kimagemapeditor.xpm
+++ b/debian/_base/kdewebdev/debian/icons/kimagemapeditor.xpm
diff --git a/debian/squeeze/kdewebdev/debian/icons/klinkstatus.xpm b/debian/_base/kdewebdev/debian/icons/klinkstatus.xpm
index 8f17fbf3d..8f17fbf3d 100644
--- a/debian/squeeze/kdewebdev/debian/icons/klinkstatus.xpm
+++ b/debian/_base/kdewebdev/debian/icons/klinkstatus.xpm
diff --git a/debian/squeeze/kdewebdev/debian/icons/quanta.xpm b/debian/_base/kdewebdev/debian/icons/quanta.xpm
index 659a3ff99..659a3ff99 100644
--- a/debian/squeeze/kdewebdev/debian/icons/quanta.xpm
+++ b/debian/_base/kdewebdev/debian/icons/quanta.xpm
diff --git a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace
index 8e685ddea..8e685ddea 100644
--- a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace
+++ b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace
diff --git a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus
index 4fbf65d44..4fbf65d44 100644
--- a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus
+++ b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus
diff --git a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander
index 233657324..233657324 100644
--- a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander
+++ b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander
diff --git a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg
index 2f14db1f4..2f14db1f4 100644
--- a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg
+++ b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg
diff --git a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta
index 6d8e92956..6d8e92956 100644
--- a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta
+++ b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta
diff --git a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg
index e4147f24f..e4147f24f 100644
--- a/debian/squeeze/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg
+++ b/debian/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg
diff --git a/debian/squeeze/kdewebdev/debian/kfilereplace-trinity.README.Debian b/debian/_base/kdewebdev/debian/kfilereplace-trinity.README.Debian
index 3d186fbcf..3d186fbcf 100644
--- a/debian/squeeze/kdewebdev/debian/kfilereplace-trinity.README.Debian
+++ b/debian/_base/kdewebdev/debian/kfilereplace-trinity.README.Debian
diff --git a/debian/squeeze/kdewebdev/debian/kfilereplace-trinity.install b/debian/_base/kdewebdev/debian/kfilereplace-trinity.install
index 368c9640b..368c9640b 100644
--- a/debian/squeeze/kdewebdev/debian/kfilereplace-trinity.install
+++ b/debian/_base/kdewebdev/debian/kfilereplace-trinity.install
diff --git a/debian/squeeze/kdewebdev/debian/kfilereplace-trinity.manpages b/debian/_base/kdewebdev/debian/kfilereplace-trinity.manpages
index cf8df22a1..cf8df22a1 100644
--- a/debian/squeeze/kdewebdev/debian/kfilereplace-trinity.manpages
+++ b/debian/_base/kdewebdev/debian/kfilereplace-trinity.manpages
diff --git a/debian/squeeze/kdewebdev/debian/kimagemapeditor-trinity.docs b/debian/_base/kdewebdev/debian/kimagemapeditor-trinity.docs
index fcf97a3eb..fcf97a3eb 100644
--- a/debian/squeeze/kdewebdev/debian/kimagemapeditor-trinity.docs
+++ b/debian/_base/kdewebdev/debian/kimagemapeditor-trinity.docs
diff --git a/debian/squeeze/kdewebdev/debian/kimagemapeditor-trinity.install b/debian/_base/kdewebdev/debian/kimagemapeditor-trinity.install
index 62dfdcceb..62dfdcceb 100644
--- a/debian/squeeze/kdewebdev/debian/kimagemapeditor-trinity.install
+++ b/debian/_base/kdewebdev/debian/kimagemapeditor-trinity.install
diff --git a/debian/squeeze/kdewebdev/debian/kimagemapeditor-trinity.manpages b/debian/_base/kdewebdev/debian/kimagemapeditor-trinity.manpages
index e9fdcdb20..e9fdcdb20 100644
--- a/debian/squeeze/kdewebdev/debian/kimagemapeditor-trinity.manpages
+++ b/debian/_base/kdewebdev/debian/kimagemapeditor-trinity.manpages
diff --git a/debian/squeeze/kdewebdev/debian/kimagemapeditor-trinity.menu b/debian/_base/kdewebdev/debian/kimagemapeditor-trinity.menu
index 04b796670..04b796670 100644
--- a/debian/squeeze/kdewebdev/debian/kimagemapeditor-trinity.menu
+++ b/debian/_base/kdewebdev/debian/kimagemapeditor-trinity.menu
diff --git a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.README.Debian b/debian/_base/kdewebdev/debian/klinkstatus-trinity.README.Debian
index e1c211379..e1c211379 100644
--- a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.README.Debian
+++ b/debian/_base/kdewebdev/debian/klinkstatus-trinity.README.Debian
diff --git a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.docs b/debian/_base/kdewebdev/debian/klinkstatus-trinity.docs
index c1da674ec..c1da674ec 100644
--- a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.docs
+++ b/debian/_base/kdewebdev/debian/klinkstatus-trinity.docs
diff --git a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.install b/debian/_base/kdewebdev/debian/klinkstatus-trinity.install
index f65852c45..f65852c45 100644
--- a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.install
+++ b/debian/_base/kdewebdev/debian/klinkstatus-trinity.install
diff --git a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.manpages b/debian/_base/kdewebdev/debian/klinkstatus-trinity.manpages
index 0a9e537e1..0a9e537e1 100644
--- a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.manpages
+++ b/debian/_base/kdewebdev/debian/klinkstatus-trinity.manpages
diff --git a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.menu b/debian/_base/kdewebdev/debian/klinkstatus-trinity.menu
index 742018cf6..742018cf6 100644
--- a/debian/squeeze/kdewebdev/debian/klinkstatus-trinity.menu
+++ b/debian/_base/kdewebdev/debian/klinkstatus-trinity.menu
diff --git a/debian/squeeze/kdewebdev/debian/kommander-trinity-dev.docs b/debian/_base/kdewebdev/debian/kommander-trinity-dev.docs
index 2ea0142a2..2ea0142a2 100644
--- a/debian/squeeze/kdewebdev/debian/kommander-trinity-dev.docs
+++ b/debian/_base/kdewebdev/debian/kommander-trinity-dev.docs
diff --git a/debian/squeeze/kdewebdev/debian/kommander-trinity-dev.install b/debian/_base/kdewebdev/debian/kommander-trinity-dev.install
index 54d904432..54d904432 100644
--- a/debian/squeeze/kdewebdev/debian/kommander-trinity-dev.install
+++ b/debian/_base/kdewebdev/debian/kommander-trinity-dev.install
diff --git a/debian/squeeze/kdewebdev/debian/kommander-trinity.README.Debian b/debian/_base/kdewebdev/debian/kommander-trinity.README.Debian
index 2b4b6e2a1..2b4b6e2a1 100644
--- a/debian/squeeze/kdewebdev/debian/kommander-trinity.README.Debian
+++ b/debian/_base/kdewebdev/debian/kommander-trinity.README.Debian
diff --git a/debian/squeeze/kdewebdev/debian/kommander-trinity.docs b/debian/_base/kdewebdev/debian/kommander-trinity.docs
index 2ea0142a2..2ea0142a2 100644
--- a/debian/squeeze/kdewebdev/debian/kommander-trinity.docs
+++ b/debian/_base/kdewebdev/debian/kommander-trinity.docs
diff --git a/debian/squeeze/kdewebdev/debian/kommander-trinity.install b/debian/_base/kdewebdev/debian/kommander-trinity.install
index a95d024c1..a95d024c1 100644
--- a/debian/squeeze/kdewebdev/debian/kommander-trinity.install
+++ b/debian/_base/kdewebdev/debian/kommander-trinity.install
diff --git a/debian/squeeze/kdewebdev/debian/kommander-trinity.manpages b/debian/_base/kdewebdev/debian/kommander-trinity.manpages
index 718a10f1e..718a10f1e 100644
--- a/debian/squeeze/kdewebdev/debian/kommander-trinity.manpages
+++ b/debian/_base/kdewebdev/debian/kommander-trinity.manpages
diff --git a/debian/squeeze/kdewebdev/debian/kommander-trinity.menu b/debian/_base/kdewebdev/debian/kommander-trinity.menu
index 7b7a2de10..7b7a2de10 100644
--- a/debian/squeeze/kdewebdev/debian/kommander-trinity.menu
+++ b/debian/_base/kdewebdev/debian/kommander-trinity.menu
diff --git a/debian/squeeze/kdewebdev/debian/kommander-trinity.shlibs b/debian/_base/kdewebdev/debian/kommander-trinity.shlibs
index 92ae6b607..92ae6b607 100644
--- a/debian/squeeze/kdewebdev/debian/kommander-trinity.shlibs
+++ b/debian/_base/kdewebdev/debian/kommander-trinity.shlibs
diff --git a/debian/squeeze/kdewebdev/debian/kxsldbg-trinity.README.Debian b/debian/_base/kdewebdev/debian/kxsldbg-trinity.README.Debian
index 23c2e7507..23c2e7507 100644
--- a/debian/squeeze/kdewebdev/debian/kxsldbg-trinity.README.Debian
+++ b/debian/_base/kdewebdev/debian/kxsldbg-trinity.README.Debian
diff --git a/debian/squeeze/kdewebdev/debian/kxsldbg-trinity.install b/debian/_base/kdewebdev/debian/kxsldbg-trinity.install
index 84fec5328..84fec5328 100644
--- a/debian/squeeze/kdewebdev/debian/kxsldbg-trinity.install
+++ b/debian/_base/kdewebdev/debian/kxsldbg-trinity.install
diff --git a/debian/squeeze/kdewebdev/debian/kxsldbg-trinity.manpages b/debian/_base/kdewebdev/debian/kxsldbg-trinity.manpages
index c56e17491..c56e17491 100644
--- a/debian/squeeze/kdewebdev/debian/kxsldbg-trinity.manpages
+++ b/debian/_base/kdewebdev/debian/kxsldbg-trinity.manpages
diff --git a/debian/squeeze/kdewebdev/debian/kxsldbg-trinity.menu b/debian/_base/kdewebdev/debian/kxsldbg-trinity.menu
index d9d4957f7..d9d4957f7 100644
--- a/debian/squeeze/kdewebdev/debian/kxsldbg-trinity.menu
+++ b/debian/_base/kdewebdev/debian/kxsldbg-trinity.menu
diff --git a/debian/squeeze/kdewebdev/debian/man/extractkmdr-trinity.1 b/debian/_base/kdewebdev/debian/man/extractkmdr-trinity.1
index 7f00356e8..7f00356e8 100644
--- a/debian/squeeze/kdewebdev/debian/man/extractkmdr-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/extractkmdr-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/man/kfilereplace-trinity.1 b/debian/_base/kdewebdev/debian/man/kfilereplace-trinity.1
index 2f8d0acd2..2f8d0acd2 100644
--- a/debian/squeeze/kdewebdev/debian/man/kfilereplace-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/kfilereplace-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/man/kimagemapeditor-trinity.1 b/debian/_base/kdewebdev/debian/man/kimagemapeditor-trinity.1
index 03642502b..03642502b 100644
--- a/debian/squeeze/kdewebdev/debian/man/kimagemapeditor-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/kimagemapeditor-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/man/klinkstatus-trinity.1 b/debian/_base/kdewebdev/debian/man/klinkstatus-trinity.1
index 1daabcd15..1daabcd15 100644
--- a/debian/squeeze/kdewebdev/debian/man/klinkstatus-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/klinkstatus-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/man/kmdr-editor-trinity.1 b/debian/_base/kdewebdev/debian/man/kmdr-editor-trinity.1
index 0af0743be..0af0743be 100644
--- a/debian/squeeze/kdewebdev/debian/man/kmdr-editor-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/kmdr-editor-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/man/kmdr-executor-trinity.1 b/debian/_base/kdewebdev/debian/man/kmdr-executor-trinity.1
index a21a84158..a21a84158 100644
--- a/debian/squeeze/kdewebdev/debian/man/kmdr-executor-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/kmdr-executor-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/man/kmdr-plugins-trinity.1 b/debian/_base/kdewebdev/debian/man/kmdr-plugins-trinity.1
index 4a75aad57..4a75aad57 100644
--- a/debian/squeeze/kdewebdev/debian/man/kmdr-plugins-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/kmdr-plugins-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/man/kmdr2po-trinity.1 b/debian/_base/kdewebdev/debian/man/kmdr2po-trinity.1
index 5d2b23d3e..5d2b23d3e 100644
--- a/debian/squeeze/kdewebdev/debian/man/kmdr2po-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/kmdr2po-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/man/kxsldbg-trinity.1 b/debian/_base/kdewebdev/debian/man/kxsldbg-trinity.1
index 9f7d11155..9f7d11155 100644
--- a/debian/squeeze/kdewebdev/debian/man/kxsldbg-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/kxsldbg-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/man/quanta-trinity.1 b/debian/_base/kdewebdev/debian/man/quanta-trinity.1
index a127d1c68..a127d1c68 100644
--- a/debian/squeeze/kdewebdev/debian/man/quanta-trinity.1
+++ b/debian/_base/kdewebdev/debian/man/quanta-trinity.1
diff --git a/debian/squeeze/kdewebdev/debian/patches/common/README b/debian/_base/kdewebdev/debian/patches/common/README
index 01a880c08..01a880c08 100644
--- a/debian/squeeze/kdewebdev/debian/patches/common/README
+++ b/debian/_base/kdewebdev/debian/patches/common/README
diff --git a/debian/squeeze/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/_base/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
index 1f825f642..1f825f642 100644
--- a/debian/squeeze/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/_base/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/squeeze/kdewebdev/debian/patches/series b/debian/_base/kdewebdev/debian/patches/series
index 8f8f0bd6b..8f8f0bd6b 100644
--- a/debian/squeeze/kdewebdev/debian/patches/series
+++ b/debian/_base/kdewebdev/debian/patches/series
diff --git a/debian/squeeze/kdewebdev/debian/quanta-data-trinity.README.Debian b/debian/_base/kdewebdev/debian/quanta-data-trinity.README.Debian
index b64da44cf..b64da44cf 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-data-trinity.README.Debian
+++ b/debian/_base/kdewebdev/debian/quanta-data-trinity.README.Debian
diff --git a/debian/squeeze/kdewebdev/debian/quanta-data-trinity.docs b/debian/_base/kdewebdev/debian/quanta-data-trinity.docs
index 39f0afb3c..39f0afb3c 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-data-trinity.docs
+++ b/debian/_base/kdewebdev/debian/quanta-data-trinity.docs
diff --git a/debian/squeeze/kdewebdev/debian/quanta-data-trinity.install b/debian/_base/kdewebdev/debian/quanta-data-trinity.install
index d02d0d9c7..d02d0d9c7 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-data-trinity.install
+++ b/debian/_base/kdewebdev/debian/quanta-data-trinity.install
diff --git a/debian/squeeze/kdewebdev/debian/quanta-data-trinity.lintian b/debian/_base/kdewebdev/debian/quanta-data-trinity.lintian
index 1b1814f88..1b1814f88 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-data-trinity.lintian
+++ b/debian/_base/kdewebdev/debian/quanta-data-trinity.lintian
diff --git a/debian/squeeze/kdewebdev/debian/quanta-trinity.README.Debian b/debian/_base/kdewebdev/debian/quanta-trinity.README.Debian
index eed8069b3..eed8069b3 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-trinity.README.Debian
+++ b/debian/_base/kdewebdev/debian/quanta-trinity.README.Debian
diff --git a/debian/squeeze/kdewebdev/debian/quanta-trinity.docs b/debian/_base/kdewebdev/debian/quanta-trinity.docs
index 39f0afb3c..39f0afb3c 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-trinity.docs
+++ b/debian/_base/kdewebdev/debian/quanta-trinity.docs
diff --git a/debian/squeeze/kdewebdev/debian/quanta-trinity.install b/debian/_base/kdewebdev/debian/quanta-trinity.install
index 7b3618363..7b3618363 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-trinity.install
+++ b/debian/_base/kdewebdev/debian/quanta-trinity.install
diff --git a/debian/squeeze/kdewebdev/debian/quanta-trinity.links b/debian/_base/kdewebdev/debian/quanta-trinity.links
index a512db79b..a512db79b 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-trinity.links
+++ b/debian/_base/kdewebdev/debian/quanta-trinity.links
diff --git a/debian/squeeze/kdewebdev/debian/quanta-trinity.lintian b/debian/_base/kdewebdev/debian/quanta-trinity.lintian
index f46ec301f..f46ec301f 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-trinity.lintian
+++ b/debian/_base/kdewebdev/debian/quanta-trinity.lintian
diff --git a/debian/squeeze/kdewebdev/debian/quanta-trinity.manpages b/debian/_base/kdewebdev/debian/quanta-trinity.manpages
index e4b4a816c..e4b4a816c 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-trinity.manpages
+++ b/debian/_base/kdewebdev/debian/quanta-trinity.manpages
diff --git a/debian/squeeze/kdewebdev/debian/quanta-trinity.menu b/debian/_base/kdewebdev/debian/quanta-trinity.menu
index 1d0a29249..1d0a29249 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-trinity.menu
+++ b/debian/_base/kdewebdev/debian/quanta-trinity.menu
diff --git a/debian/squeeze/kdewebdev/debian/rules b/debian/_base/kdewebdev/debian/rules
index 9cbfc111e..9cbfc111e 100755
--- a/debian/squeeze/kdewebdev/debian/rules
+++ b/debian/_base/kdewebdev/debian/rules
diff --git a/debian/squeeze/kdewebdev/debian/source/format b/debian/_base/kdewebdev/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/kdewebdev/debian/source/format
+++ b/debian/_base/kdewebdev/debian/source/format
diff --git a/debian/squeeze/kdewebdev/debian/source/options b/debian/_base/kdewebdev/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/kdewebdev/debian/source/options
+++ b/debian/_base/kdewebdev/debian/source/options
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/TODO b/debian/_base/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/TODO
+++ b/debian/_base/libraries/kipi-plugins/debian/TODO
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk b/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/libraries/kipi-plugins/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk b/debian/_base/libraries/kipi-plugins/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk
+++ b/debian/_base/libraries/kipi-plugins/debian/cdbs/kde.mk
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/versions.pl b/debian/_base/libraries/kipi-plugins/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ b/debian/_base/libraries/kipi-plugins/debian/cdbs/versions.pl
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/changelog b/debian/_base/libraries/kipi-plugins/debian/changelog
index 20dc96c92..20dc96c92 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/changelog
+++ b/debian/_base/libraries/kipi-plugins/debian/changelog
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/compat b/debian/_base/libraries/kipi-plugins/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/compat
+++ b/debian/_base/libraries/kipi-plugins/debian/compat
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/control b/debian/_base/libraries/kipi-plugins/debian/control
index 9fd29a1e6..9fd29a1e6 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/control
+++ b/debian/_base/libraries/kipi-plugins/debian/control
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/copyright b/debian/_base/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/copyright
+++ b/debian/_base/libraries/kipi-plugins/debian/copyright
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/debian/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/debian/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/debian/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/debian/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/debian/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/debian/_base/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/patches/series b/debian/_base/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/patches/series
+++ b/debian/_base/libraries/kipi-plugins/debian/patches/series
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/rules b/debian/_base/libraries/kipi-plugins/debian/rules
index 834db7ba0..834db7ba0 100755
--- a/debian/squeeze/libraries/kipi-plugins/debian/rules
+++ b/debian/_base/libraries/kipi-plugins/debian/rules
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/source/format b/debian/_base/libraries/kipi-plugins/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/source/format
+++ b/debian/_base/libraries/kipi-plugins/debian/source/format
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/source/options b/debian/_base/libraries/kipi-plugins/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/source/options
+++ b/debian/_base/libraries/kipi-plugins/debian/source/options
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/watch b/debian/_base/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/watch
+++ b/debian/_base/libraries/kipi-plugins/debian/watch
diff --git a/debian/squeeze/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk b/debian/_base/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/libraries/libkdcraw/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk b/debian/_base/libraries/libkdcraw/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk
+++ b/debian/_base/libraries/libkdcraw/debian/cdbs/kde.mk
diff --git a/debian/squeeze/libraries/libkdcraw/debian/cdbs/versions.pl b/debian/_base/libraries/libkdcraw/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/cdbs/versions.pl
+++ b/debian/_base/libraries/libkdcraw/debian/cdbs/versions.pl
diff --git a/debian/squeeze/libraries/libkdcraw/debian/changelog b/debian/_base/libraries/libkdcraw/debian/changelog
index 623855d60..623855d60 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/changelog
+++ b/debian/_base/libraries/libkdcraw/debian/changelog
diff --git a/debian/squeeze/libraries/libkdcraw/debian/compat b/debian/_base/libraries/libkdcraw/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/compat
+++ b/debian/_base/libraries/libkdcraw/debian/compat
diff --git a/debian/squeeze/libraries/libkdcraw/debian/control b/debian/_base/libraries/libkdcraw/debian/control
index 18ef7e023..18ef7e023 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/control
+++ b/debian/_base/libraries/libkdcraw/debian/control
diff --git a/debian/squeeze/libraries/libkdcraw/debian/copyright b/debian/_base/libraries/libkdcraw/debian/copyright
index 05b67ad60..05b67ad60 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/copyright
+++ b/debian/_base/libraries/libkdcraw/debian/copyright
diff --git a/debian/squeeze/libraries/libkdcraw/debian/docs b/debian/_base/libraries/libkdcraw/debian/docs
index 50bd824bb..50bd824bb 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/docs
+++ b/debian/_base/libraries/libkdcraw/debian/docs
diff --git a/debian/squeeze/libraries/libkdcraw/debian/libkdcraw3-trinity-dev.install b/debian/_base/libraries/libkdcraw/debian/libkdcraw3-trinity-dev.install
index c07b71b2d..c07b71b2d 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/libkdcraw3-trinity-dev.install
+++ b/debian/_base/libraries/libkdcraw/debian/libkdcraw3-trinity-dev.install
diff --git a/debian/squeeze/libraries/libkdcraw/debian/libkdcraw3-trinity.install b/debian/_base/libraries/libkdcraw/debian/libkdcraw3-trinity.install
index cdef643e7..cdef643e7 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/libkdcraw3-trinity.install
+++ b/debian/_base/libraries/libkdcraw/debian/libkdcraw3-trinity.install
diff --git a/debian/squeeze/libraries/libkdcraw/debian/rules b/debian/_base/libraries/libkdcraw/debian/rules
index bbc6f0d96..bbc6f0d96 100755
--- a/debian/squeeze/libraries/libkdcraw/debian/rules
+++ b/debian/_base/libraries/libkdcraw/debian/rules
diff --git a/debian/squeeze/libraries/libkdcraw/debian/source/format b/debian/_base/libraries/libkdcraw/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/source/format
+++ b/debian/_base/libraries/libkdcraw/debian/source/format
diff --git a/debian/squeeze/libraries/libkdcraw/debian/source/options b/debian/_base/libraries/libkdcraw/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/source/options
+++ b/debian/_base/libraries/libkdcraw/debian/source/options
diff --git a/debian/squeeze/libraries/libkdcraw/debian/watch b/debian/_base/libraries/libkdcraw/debian/watch
index ba648e43d..ba648e43d 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/watch
+++ b/debian/_base/libraries/libkdcraw/debian/watch
diff --git a/debian/squeeze/libraries/libkexiv2/debian/README.Debian b/debian/_base/libraries/libkexiv2/debian/README.Debian
index b49d315a1..b49d315a1 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/README.Debian
+++ b/debian/_base/libraries/libkexiv2/debian/README.Debian
diff --git a/debian/squeeze/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk b/debian/_base/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/libraries/libkexiv2/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk b/debian/_base/libraries/libkexiv2/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk
+++ b/debian/_base/libraries/libkexiv2/debian/cdbs/kde.mk
diff --git a/debian/squeeze/libraries/libkexiv2/debian/cdbs/versions.pl b/debian/_base/libraries/libkexiv2/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/cdbs/versions.pl
+++ b/debian/_base/libraries/libkexiv2/debian/cdbs/versions.pl
diff --git a/debian/squeeze/libraries/libkexiv2/debian/changelog b/debian/_base/libraries/libkexiv2/debian/changelog
index 9070cbb58..9070cbb58 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/changelog
+++ b/debian/_base/libraries/libkexiv2/debian/changelog
diff --git a/debian/squeeze/libraries/libkexiv2/debian/compat b/debian/_base/libraries/libkexiv2/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/compat
+++ b/debian/_base/libraries/libkexiv2/debian/compat
diff --git a/debian/squeeze/libraries/libkexiv2/debian/control b/debian/_base/libraries/libkexiv2/debian/control
index e88e30646..e88e30646 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/control
+++ b/debian/_base/libraries/libkexiv2/debian/control
diff --git a/debian/squeeze/libraries/libkexiv2/debian/copyright b/debian/_base/libraries/libkexiv2/debian/copyright
index 2e711aec5..2e711aec5 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/copyright
+++ b/debian/_base/libraries/libkexiv2/debian/copyright
diff --git a/debian/squeeze/libraries/libkexiv2/debian/libkexiv2-3-trinity-dev.install b/debian/_base/libraries/libkexiv2/debian/libkexiv2-3-trinity-dev.install
index 1333fe738..1333fe738 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/libkexiv2-3-trinity-dev.install
+++ b/debian/_base/libraries/libkexiv2/debian/libkexiv2-3-trinity-dev.install
diff --git a/debian/squeeze/libraries/libkexiv2/debian/libkexiv2-3-trinity.install b/debian/_base/libraries/libkexiv2/debian/libkexiv2-3-trinity.install
index 11882501a..11882501a 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/libkexiv2-3-trinity.install
+++ b/debian/_base/libraries/libkexiv2/debian/libkexiv2-3-trinity.install
diff --git a/debian/squeeze/libraries/libkexiv2/debian/patches/.gitignore b/debian/_base/libraries/libkexiv2/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/patches/.gitignore
+++ b/debian/_base/libraries/libkexiv2/debian/patches/.gitignore
diff --git a/debian/squeeze/libraries/libkexiv2/debian/rules b/debian/_base/libraries/libkexiv2/debian/rules
index 60174829a..60174829a 100755
--- a/debian/squeeze/libraries/libkexiv2/debian/rules
+++ b/debian/_base/libraries/libkexiv2/debian/rules
diff --git a/debian/squeeze/libraries/libkexiv2/debian/source/format b/debian/_base/libraries/libkexiv2/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/source/format
+++ b/debian/_base/libraries/libkexiv2/debian/source/format
diff --git a/debian/squeeze/libraries/libkexiv2/debian/source/options b/debian/_base/libraries/libkexiv2/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/source/options
+++ b/debian/_base/libraries/libkexiv2/debian/source/options
diff --git a/debian/squeeze/libraries/libkexiv2/debian/watch b/debian/_base/libraries/libkexiv2/debian/watch
index 781107196..781107196 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/watch
+++ b/debian/_base/libraries/libkexiv2/debian/watch
diff --git a/debian/squeeze/libraries/libkipi/debian/README.Debian b/debian/_base/libraries/libkipi/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/squeeze/libraries/libkipi/debian/README.Debian
+++ b/debian/_base/libraries/libkipi/debian/README.Debian
diff --git a/debian/squeeze/libraries/libkipi/debian/TODO b/debian/_base/libraries/libkipi/debian/TODO
index 383c04cea..383c04cea 100644
--- a/debian/squeeze/libraries/libkipi/debian/TODO
+++ b/debian/_base/libraries/libkipi/debian/TODO
diff --git a/debian/squeeze/libraries/libkipi/debian/cdbs/debian-qt-kde.mk b/debian/_base/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/debian/squeeze/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/libraries/libkipi/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk b/debian/_base/libraries/libkipi/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk
+++ b/debian/_base/libraries/libkipi/debian/cdbs/kde.mk
diff --git a/debian/squeeze/libraries/libkipi/debian/cdbs/versions.pl b/debian/_base/libraries/libkipi/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/libraries/libkipi/debian/cdbs/versions.pl
+++ b/debian/_base/libraries/libkipi/debian/cdbs/versions.pl
diff --git a/debian/squeeze/libraries/libkipi/debian/changelog b/debian/_base/libraries/libkipi/debian/changelog
index 8759c69c0..8759c69c0 100644
--- a/debian/squeeze/libraries/libkipi/debian/changelog
+++ b/debian/_base/libraries/libkipi/debian/changelog
diff --git a/debian/squeeze/libraries/libkipi/debian/compat b/debian/_base/libraries/libkipi/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/libraries/libkipi/debian/compat
+++ b/debian/_base/libraries/libkipi/debian/compat
diff --git a/debian/squeeze/libraries/libkipi/debian/control b/debian/_base/libraries/libkipi/debian/control
index 8d85d308e..8d85d308e 100644
--- a/debian/squeeze/libraries/libkipi/debian/control
+++ b/debian/_base/libraries/libkipi/debian/control
diff --git a/debian/squeeze/libraries/libkipi/debian/copyright b/debian/_base/libraries/libkipi/debian/copyright
index 46dc95db6..46dc95db6 100644
--- a/debian/squeeze/libraries/libkipi/debian/copyright
+++ b/debian/_base/libraries/libkipi/debian/copyright
diff --git a/debian/squeeze/libraries/libkipi/debian/libkipi0-trinity-dev.install b/debian/_base/libraries/libkipi/debian/libkipi0-trinity-dev.install
index a211719ab..a211719ab 100644
--- a/debian/squeeze/libraries/libkipi/debian/libkipi0-trinity-dev.install
+++ b/debian/_base/libraries/libkipi/debian/libkipi0-trinity-dev.install
diff --git a/debian/squeeze/libraries/libkipi/debian/libkipi0-trinity.install b/debian/_base/libraries/libkipi/debian/libkipi0-trinity.install
index 6f99e7cb2..6f99e7cb2 100644
--- a/debian/squeeze/libraries/libkipi/debian/libkipi0-trinity.install
+++ b/debian/_base/libraries/libkipi/debian/libkipi0-trinity.install
diff --git a/debian/squeeze/libraries/libkipi/debian/patches/series b/debian/_base/libraries/libkipi/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/libraries/libkipi/debian/patches/series
+++ b/debian/_base/libraries/libkipi/debian/patches/series
diff --git a/debian/squeeze/libraries/libkipi/debian/rules b/debian/_base/libraries/libkipi/debian/rules
index ee0b9c258..ee0b9c258 100755
--- a/debian/squeeze/libraries/libkipi/debian/rules
+++ b/debian/_base/libraries/libkipi/debian/rules
diff --git a/debian/squeeze/libraries/libkipi/debian/source/format b/debian/_base/libraries/libkipi/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/libkipi/debian/source/format
+++ b/debian/_base/libraries/libkipi/debian/source/format
diff --git a/debian/squeeze/libraries/libkipi/debian/source/options b/debian/_base/libraries/libkipi/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/libkipi/debian/source/options
+++ b/debian/_base/libraries/libkipi/debian/source/options
diff --git a/debian/squeeze/libraries/libkipi/debian/watch b/debian/_base/libraries/libkipi/debian/watch
index a913b7d89..a913b7d89 100644
--- a/debian/squeeze/libraries/libkipi/debian/watch
+++ b/debian/_base/libraries/libkipi/debian/watch
diff --git a/debian/squeeze/libraries/libksquirrel/debian/changelog b/debian/_base/libraries/libksquirrel/debian/changelog
index 8adf184a4..8adf184a4 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/changelog
+++ b/debian/_base/libraries/libksquirrel/debian/changelog
diff --git a/debian/squeeze/libraries/libksquirrel/debian/compat b/debian/_base/libraries/libksquirrel/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/compat
+++ b/debian/_base/libraries/libksquirrel/debian/compat
diff --git a/debian/squeeze/libraries/libksquirrel/debian/control b/debian/_base/libraries/libksquirrel/debian/control
index 781070853..781070853 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/control
+++ b/debian/_base/libraries/libksquirrel/debian/control
diff --git a/debian/squeeze/libraries/libksquirrel/debian/copyright b/debian/_base/libraries/libksquirrel/debian/copyright
index 7d13d101a..7d13d101a 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/copyright
+++ b/debian/_base/libraries/libksquirrel/debian/copyright
diff --git a/debian/squeeze/libraries/libksquirrel/debian/libksquirrel-tools-trinity.install b/debian/_base/libraries/libksquirrel/debian/libksquirrel-tools-trinity.install
index 70a5cfea3..70a5cfea3 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/libksquirrel-tools-trinity.install
+++ b/debian/_base/libraries/libksquirrel/debian/libksquirrel-tools-trinity.install
diff --git a/debian/squeeze/libraries/libksquirrel/debian/libksquirrel-trinity-dev.install b/debian/_base/libraries/libksquirrel/debian/libksquirrel-trinity-dev.install
index 7541dd795..7541dd795 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/libksquirrel-trinity-dev.install
+++ b/debian/_base/libraries/libksquirrel/debian/libksquirrel-trinity-dev.install
diff --git a/debian/squeeze/libraries/libksquirrel/debian/libksquirrel0-trinity.install b/debian/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
index e247609bf..e247609bf 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/libksquirrel0-trinity.install
+++ b/debian/_base/libraries/libksquirrel/debian/libksquirrel0-trinity.install
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
index 51c0b6a04..51c0b6a04 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-camera2ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
index df2cd06d1..df2cd06d1 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dcraw.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
index cfe155b5a..cfe155b5a 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-dicom2png.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
index 9ddc44614..9ddc44614 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-fig2ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
index 4b1477bef..4b1477bef 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-iff2ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
index 81ce62873..81ce62873 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-leaf2ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
index 6b38ef8da..6b38ef8da 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm-s.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
index 21109a348..21109a348 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ljpeg2ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
index 26aa84076..26aa84076 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-mac2ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
index fcd6d5171..fcd6d5171 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-neo2ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
index ba620502c..ba620502c 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi12ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
index d662bec23..d662bec23 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-pi32ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
index 585d8cb36..585d8cb36 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-svg2png.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
index 7c0950acd..7c0950acd 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-ttf2pnm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
index ddec06008..ddec06008 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-utah2ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
index 3148b5faa..3148b5faa 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xcf2pnm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1 b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
index 041fdb9ed..041fdb9ed 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
+++ b/debian/_base/libraries/libksquirrel/debian/mans/ksquirrel-libs-xim2ppm.1
diff --git a/debian/squeeze/libraries/libksquirrel/debian/patches/.gitignore b/debian/_base/libraries/libksquirrel/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/patches/.gitignore
+++ b/debian/_base/libraries/libksquirrel/debian/patches/.gitignore
diff --git a/debian/squeeze/libraries/libksquirrel/debian/rules b/debian/_base/libraries/libksquirrel/debian/rules
index 18a60f11f..18a60f11f 100755
--- a/debian/squeeze/libraries/libksquirrel/debian/rules
+++ b/debian/_base/libraries/libksquirrel/debian/rules
diff --git a/debian/squeeze/libraries/libksquirrel/debian/source/format b/debian/_base/libraries/libksquirrel/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/source/format
+++ b/debian/_base/libraries/libksquirrel/debian/source/format
diff --git a/debian/squeeze/libraries/libksquirrel/debian/source/options b/debian/_base/libraries/libksquirrel/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/source/options
+++ b/debian/_base/libraries/libksquirrel/debian/source/options
diff --git a/debian/squeeze/libraries/libksquirrel/debian/watch b/debian/_base/libraries/libksquirrel/debian/watch
index d9b799728..d9b799728 100644
--- a/debian/squeeze/libraries/libksquirrel/debian/watch
+++ b/debian/_base/libraries/libksquirrel/debian/watch
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/source/format b/debian/_base/libraries/libtqt-perl/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/source/format
+++ b/debian/_base/libraries/libtqt-perl/debian/source/format
diff --git a/debian/squeeze/libraries/libtqt-perl/debian/source/options b/debian/_base/libraries/libtqt-perl/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/libtqt-perl/debian/source/options
+++ b/debian/_base/libraries/libtqt-perl/debian/source/options
diff --git a/debian/squeeze/libraries/mlt++/debian/README.Debian b/debian/_base/libraries/mlt++/debian/README.Debian
index 3afa8664c..3afa8664c 100644
--- a/debian/squeeze/libraries/mlt++/debian/README.Debian
+++ b/debian/_base/libraries/mlt++/debian/README.Debian
diff --git a/debian/squeeze/libraries/mlt++/debian/changelog b/debian/_base/libraries/mlt++/debian/changelog
index 981452ad7..981452ad7 100644
--- a/debian/squeeze/libraries/mlt++/debian/changelog
+++ b/debian/_base/libraries/mlt++/debian/changelog
diff --git a/debian/squeeze/libraries/mlt++/debian/compat b/debian/_base/libraries/mlt++/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/libraries/mlt++/debian/compat
+++ b/debian/_base/libraries/mlt++/debian/compat
diff --git a/debian/squeeze/libraries/mlt++/debian/control b/debian/_base/libraries/mlt++/debian/control
index 970b21154..970b21154 100644
--- a/debian/squeeze/libraries/mlt++/debian/control
+++ b/debian/_base/libraries/mlt++/debian/control
diff --git a/debian/squeeze/libraries/mlt++/debian/copyright b/debian/_base/libraries/mlt++/debian/copyright
index 974ccd34b..974ccd34b 100644
--- a/debian/squeeze/libraries/mlt++/debian/copyright
+++ b/debian/_base/libraries/mlt++/debian/copyright
diff --git a/debian/squeeze/libraries/mlt++/debian/libmlt++-trinity-dev.files b/debian/_base/libraries/mlt++/debian/libmlt++-trinity-dev.files
index 18ce6b959..18ce6b959 100644
--- a/debian/squeeze/libraries/mlt++/debian/libmlt++-trinity-dev.files
+++ b/debian/_base/libraries/mlt++/debian/libmlt++-trinity-dev.files
diff --git a/debian/squeeze/libraries/mlt++/debian/rules b/debian/_base/libraries/mlt++/debian/rules
index cd87c6cce..cd87c6cce 100755
--- a/debian/squeeze/libraries/mlt++/debian/rules
+++ b/debian/_base/libraries/mlt++/debian/rules
diff --git a/debian/squeeze/libraries/mlt++/debian/source/format b/debian/_base/libraries/mlt++/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/mlt++/debian/source/format
+++ b/debian/_base/libraries/mlt++/debian/source/format
diff --git a/debian/squeeze/libraries/mlt++/debian/source/options b/debian/_base/libraries/mlt++/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/mlt++/debian/source/options
+++ b/debian/_base/libraries/mlt++/debian/source/options
diff --git a/debian/squeeze/libraries/mlt++/debian/watch b/debian/_base/libraries/mlt++/debian/watch
index 1349d4e90..1349d4e90 100644
--- a/debian/squeeze/libraries/mlt++/debian/watch
+++ b/debian/_base/libraries/mlt++/debian/watch
diff --git a/debian/squeeze/libraries/mlt/debian/changelog b/debian/_base/libraries/mlt/debian/changelog
index c1226d47e..c1226d47e 100644
--- a/debian/squeeze/libraries/mlt/debian/changelog
+++ b/debian/_base/libraries/mlt/debian/changelog
diff --git a/debian/squeeze/libraries/mlt/debian/compat b/debian/_base/libraries/mlt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/libraries/mlt/debian/compat
+++ b/debian/_base/libraries/mlt/debian/compat
diff --git a/debian/squeeze/libraries/mlt/debian/control b/debian/_base/libraries/mlt/debian/control
index 50b9ed4e0..50b9ed4e0 100644
--- a/debian/squeeze/libraries/mlt/debian/control
+++ b/debian/_base/libraries/mlt/debian/control
diff --git a/debian/squeeze/libraries/mlt/debian/copyright b/debian/_base/libraries/mlt/debian/copyright
index a95008a7d..a95008a7d 100644
--- a/debian/squeeze/libraries/mlt/debian/copyright
+++ b/debian/_base/libraries/mlt/debian/copyright
diff --git a/debian/squeeze/libraries/mlt/debian/libmiracle0.2.5-trinity.install b/debian/_base/libraries/mlt/debian/libmiracle0.2.5-trinity.install
index 41bd5918b..41bd5918b 100644
--- a/debian/squeeze/libraries/mlt/debian/libmiracle0.2.5-trinity.install
+++ b/debian/_base/libraries/mlt/debian/libmiracle0.2.5-trinity.install
diff --git a/debian/squeeze/libraries/mlt/debian/libmlt-dev.manpages b/debian/_base/libraries/mlt/debian/libmlt-dev.manpages
index fe9b9ccbb..fe9b9ccbb 100644
--- a/debian/squeeze/libraries/mlt/debian/libmlt-dev.manpages
+++ b/debian/_base/libraries/mlt/debian/libmlt-dev.manpages
diff --git a/debian/squeeze/libraries/mlt/debian/libmlt-trinity-dev.install b/debian/_base/libraries/mlt/debian/libmlt-trinity-dev.install
index b634111fb..b634111fb 100644
--- a/debian/squeeze/libraries/mlt/debian/libmlt-trinity-dev.install
+++ b/debian/_base/libraries/mlt/debian/libmlt-trinity-dev.install
diff --git a/debian/squeeze/libraries/mlt/debian/libmlt0.2.5-trinity.install b/debian/_base/libraries/mlt/debian/libmlt0.2.5-trinity.install
index 8640103cf..8640103cf 100644
--- a/debian/squeeze/libraries/mlt/debian/libmlt0.2.5-trinity.install
+++ b/debian/_base/libraries/mlt/debian/libmlt0.2.5-trinity.install
diff --git a/debian/squeeze/libraries/mlt/debian/libvalerie0.2.5-trinity.install b/debian/_base/libraries/mlt/debian/libvalerie0.2.5-trinity.install
index b2ee6434c..b2ee6434c 100644
--- a/debian/squeeze/libraries/mlt/debian/libvalerie0.2.5-trinity.install
+++ b/debian/_base/libraries/mlt/debian/libvalerie0.2.5-trinity.install
diff --git a/debian/squeeze/libraries/mlt/debian/mlt-config.1 b/debian/_base/libraries/mlt/debian/mlt-config.1
index 9e700d957..9e700d957 100644
--- a/debian/squeeze/libraries/mlt/debian/mlt-config.1
+++ b/debian/_base/libraries/mlt/debian/mlt-config.1
diff --git a/debian/squeeze/libraries/mlt/debian/patches/.gitignore b/debian/_base/libraries/mlt/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/libraries/mlt/debian/patches/.gitignore
+++ b/debian/_base/libraries/mlt/debian/patches/.gitignore
diff --git a/debian/squeeze/libraries/mlt/debian/rules b/debian/_base/libraries/mlt/debian/rules
index 80bbbcdc7..80bbbcdc7 100755
--- a/debian/squeeze/libraries/mlt/debian/rules
+++ b/debian/_base/libraries/mlt/debian/rules
diff --git a/debian/squeeze/libraries/mlt/debian/source/format b/debian/_base/libraries/mlt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/mlt/debian/source/format
+++ b/debian/_base/libraries/mlt/debian/source/format
diff --git a/debian/squeeze/libraries/mlt/debian/source/options b/debian/_base/libraries/mlt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/mlt/debian/source/options
+++ b/debian/_base/libraries/mlt/debian/source/options
diff --git a/debian/squeeze/libraries/mlt/debian/watch b/debian/_base/libraries/mlt/debian/watch
index 4dcc9e900..4dcc9e900 100644
--- a/debian/squeeze/libraries/mlt/debian/watch
+++ b/debian/_base/libraries/mlt/debian/watch
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/README.Debian b/debian/_base/libraries/pykdeextensions/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/README.Debian
+++ b/debian/_base/libraries/pykdeextensions/debian/README.Debian
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/changelog b/debian/_base/libraries/pykdeextensions/debian/changelog
index aa3b5a07d..aa3b5a07d 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/changelog
+++ b/debian/_base/libraries/pykdeextensions/debian/changelog
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/compat b/debian/_base/libraries/pykdeextensions/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/compat
+++ b/debian/_base/libraries/pykdeextensions/debian/compat
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/control b/debian/_base/libraries/pykdeextensions/debian/control
index f0cf11449..f0cf11449 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/control
+++ b/debian/_base/libraries/pykdeextensions/debian/control
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/copyright b/debian/_base/libraries/pykdeextensions/debian/copyright
index a90a21587..a90a21587 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/copyright
+++ b/debian/_base/libraries/pykdeextensions/debian/copyright
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/docs b/debian/_base/libraries/pykdeextensions/debian/docs
index e845566c0..e845566c0 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/docs
+++ b/debian/_base/libraries/pykdeextensions/debian/docs
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install b/debian/_base/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install
index f50fc4e15..f50fc4e15 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/debian/_base/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/libpythonize0-trinity.install b/debian/_base/libraries/pykdeextensions/debian/libpythonize0-trinity.install
index 48601d2d0..48601d2d0 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/libpythonize0-trinity.install
+++ b/debian/_base/libraries/pykdeextensions/debian/libpythonize0-trinity.install
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/patches/.gitignore b/debian/_base/libraries/pykdeextensions/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/patches/.gitignore
+++ b/debian/_base/libraries/pykdeextensions/debian/patches/.gitignore
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/patches/11_fix_get_libdir_name.diff b/debian/_base/libraries/pykdeextensions/debian/patches/11_fix_get_libdir_name.diff
index 2a5eb9bc8..2a5eb9bc8 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/debian/_base/libraries/pykdeextensions/debian/patches/11_fix_get_libdir_name.diff
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/patches/series b/debian/_base/libraries/pykdeextensions/debian/patches/series
index 4e4c2c945..4e4c2c945 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/patches/series
+++ b/debian/_base/libraries/pykdeextensions/debian/patches/series
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/pycompat b/debian/_base/libraries/pykdeextensions/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/pycompat
+++ b/debian/_base/libraries/pykdeextensions/debian/pycompat
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.install b/debian/_base/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
index 3bbebee2f..3bbebee2f 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
+++ b/debian/_base/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides b/debian/_base/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
index 71fc709f5..71fc709f5 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
+++ b/debian/_base/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/debian/_base/libraries/pykdeextensions/debian/python-distutils-jaunty.mk
index db329306c..db329306c 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/python-distutils-jaunty.mk
+++ b/debian/_base/libraries/pykdeextensions/debian/python-distutils-jaunty.mk
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/pyversions b/debian/_base/libraries/pykdeextensions/debian/pyversions
index 0c043f18c..0c043f18c 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/pyversions
+++ b/debian/_base/libraries/pykdeextensions/debian/pyversions
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/rules b/debian/_base/libraries/pykdeextensions/debian/rules
index 8be5e322e..8be5e322e 100755
--- a/debian/squeeze/libraries/pykdeextensions/debian/rules
+++ b/debian/_base/libraries/pykdeextensions/debian/rules
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/source/format b/debian/_base/libraries/pykdeextensions/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/source/format
+++ b/debian/_base/libraries/pykdeextensions/debian/source/format
diff --git a/debian/squeeze/libraries/pykdeextensions/debian/source/options b/debian/_base/libraries/pykdeextensions/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/pykdeextensions/debian/source/options
+++ b/debian/_base/libraries/pykdeextensions/debian/source/options
diff --git a/debian/squeeze/libraries/python-trinity/debian/NEWS.Debian b/debian/_base/libraries/python-trinity/debian/NEWS.Debian
index 367c6950d..367c6950d 100644
--- a/debian/squeeze/libraries/python-trinity/debian/NEWS.Debian
+++ b/debian/_base/libraries/python-trinity/debian/NEWS.Debian
diff --git a/debian/squeeze/libraries/python-trinity/debian/changelog b/debian/_base/libraries/python-trinity/debian/changelog
index 48f8d4dae..48f8d4dae 100644
--- a/debian/squeeze/libraries/python-trinity/debian/changelog
+++ b/debian/_base/libraries/python-trinity/debian/changelog
diff --git a/debian/squeeze/libraries/python-trinity/debian/compat b/debian/_base/libraries/python-trinity/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/libraries/python-trinity/debian/compat
+++ b/debian/_base/libraries/python-trinity/debian/compat
diff --git a/debian/squeeze/libraries/python-trinity/debian/control b/debian/_base/libraries/python-trinity/debian/control
index b56c2f8e8..b56c2f8e8 100644
--- a/debian/squeeze/libraries/python-trinity/debian/control
+++ b/debian/_base/libraries/python-trinity/debian/control
diff --git a/debian/squeeze/libraries/python-trinity/debian/copyright b/debian/_base/libraries/python-trinity/debian/copyright
index eec6b36a5..eec6b36a5 100644
--- a/debian/squeeze/libraries/python-trinity/debian/copyright
+++ b/debian/_base/libraries/python-trinity/debian/copyright
diff --git a/debian/squeeze/libraries/python-trinity/debian/patches/.gitignore b/debian/_base/libraries/python-trinity/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/libraries/python-trinity/debian/patches/.gitignore
+++ b/debian/_base/libraries/python-trinity/debian/patches/.gitignore
diff --git a/debian/squeeze/libraries/python-trinity/debian/pykdeconfig.py b/debian/_base/libraries/python-trinity/debian/pykdeconfig.py
index 9e3840afe..9e3840afe 100644
--- a/debian/squeeze/libraries/python-trinity/debian/pykdeconfig.py
+++ b/debian/_base/libraries/python-trinity/debian/pykdeconfig.py
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.dirs b/debian/_base/libraries/python-trinity/debian/python-trinity-doc.dirs
index 8c23689f0..8c23689f0 100644
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.dirs
+++ b/debian/_base/libraries/python-trinity/debian/python-trinity-doc.dirs
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.doc-base b/debian/_base/libraries/python-trinity/debian/python-trinity-doc.doc-base
index 58c6a2651..58c6a2651 100644
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.doc-base
+++ b/debian/_base/libraries/python-trinity/debian/python-trinity-doc.doc-base
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.examples b/debian/_base/libraries/python-trinity/debian/python-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.examples
+++ b/debian/_base/libraries/python-trinity/debian/python-trinity-doc.examples
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.install b/debian/_base/libraries/python-trinity/debian/python-trinity-doc.install
index 146aeabc5..146aeabc5 100644
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-doc.install
+++ b/debian/_base/libraries/python-trinity/debian/python-trinity-doc.install
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
index c395de89f..c395de89f 100644
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
+++ b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
index 7b0c03e54..7b0c03e54 100644
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity-dev.install
+++ b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install
diff --git a/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity.install b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install
index facee2907..facee2907 100644
--- a/debian/squeeze/libraries/python-trinity/debian/python-trinity-trinity.install
+++ b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install
diff --git a/debian/squeeze/libraries/python-trinity/debian/rules b/debian/_base/libraries/python-trinity/debian/rules
index f1546efe6..f1546efe6 100755
--- a/debian/squeeze/libraries/python-trinity/debian/rules
+++ b/debian/_base/libraries/python-trinity/debian/rules
diff --git a/debian/squeeze/libraries/python-trinity/debian/source/format b/debian/_base/libraries/python-trinity/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/debian/squeeze/libraries/python-trinity/debian/source/format
+++ b/debian/_base/libraries/python-trinity/debian/source/format
diff --git a/debian/squeeze/libraries/python-trinity/debian/source/options b/debian/_base/libraries/python-trinity/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/libraries/python-trinity/debian/source/options
+++ b/debian/_base/libraries/python-trinity/debian/source/options
diff --git a/debian/squeeze/libraries/python-trinity/debian/watch b/debian/_base/libraries/python-trinity/debian/watch
index 8b3afcac0..8b3afcac0 100644
--- a/debian/squeeze/libraries/python-trinity/debian/watch
+++ b/debian/_base/libraries/python-trinity/debian/watch
diff --git a/debian/squeeze/metapackages/meta-kde/debian/README.Debian b/debian/_base/metapackages/meta-kde/debian/README.Debian
index 6591fa872..6591fa872 100644
--- a/debian/squeeze/metapackages/meta-kde/debian/README.Debian
+++ b/debian/_base/metapackages/meta-kde/debian/README.Debian
diff --git a/debian/squeeze/metapackages/meta-kde/debian/changelog b/debian/_base/metapackages/meta-kde/debian/changelog
index 7c5da1b8f..7c5da1b8f 100644
--- a/debian/squeeze/metapackages/meta-kde/debian/changelog
+++ b/debian/_base/metapackages/meta-kde/debian/changelog
diff --git a/debian/squeeze/metapackages/meta-kde/debian/compat b/debian/_base/metapackages/meta-kde/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/metapackages/meta-kde/debian/compat
+++ b/debian/_base/metapackages/meta-kde/debian/compat
diff --git a/debian/squeeze/metapackages/meta-kde/debian/control b/debian/_base/metapackages/meta-kde/debian/control
index ab456521e..ab456521e 100644
--- a/debian/squeeze/metapackages/meta-kde/debian/control
+++ b/debian/_base/metapackages/meta-kde/debian/control
diff --git a/debian/squeeze/metapackages/meta-kde/debian/copyright b/debian/_base/metapackages/meta-kde/debian/copyright
index a007b7115..a007b7115 100644
--- a/debian/squeeze/metapackages/meta-kde/debian/copyright
+++ b/debian/_base/metapackages/meta-kde/debian/copyright
diff --git a/debian/squeeze/metapackages/meta-kde/debian/kde-core.README.Debian b/debian/_base/metapackages/meta-kde/debian/kde-core.README.Debian
index 903888432..903888432 120000
--- a/debian/squeeze/metapackages/meta-kde/debian/kde-core.README.Debian
+++ b/debian/_base/metapackages/meta-kde/debian/kde-core.README.Debian
diff --git a/debian/squeeze/metapackages/meta-kde/debian/kde-devel.README.Debian b/debian/_base/metapackages/meta-kde/debian/kde-devel.README.Debian
index 903888432..903888432 120000
--- a/debian/squeeze/metapackages/meta-kde/debian/kde-devel.README.Debian
+++ b/debian/_base/metapackages/meta-kde/debian/kde-devel.README.Debian
diff --git a/debian/squeeze/metapackages/meta-kde/debian/kde.README.Debian b/debian/_base/metapackages/meta-kde/debian/kde.README.Debian
index 903888432..903888432 120000
--- a/debian/squeeze/metapackages/meta-kde/debian/kde.README.Debian
+++ b/debian/_base/metapackages/meta-kde/debian/kde.README.Debian
diff --git a/debian/squeeze/metapackages/meta-kde/debian/rules b/debian/_base/metapackages/meta-kde/debian/rules
index a3fbf99a7..a3fbf99a7 100755
--- a/debian/squeeze/metapackages/meta-kde/debian/rules
+++ b/debian/_base/metapackages/meta-kde/debian/rules
diff --git a/debian/squeeze/metapackages/meta-kde/debian/source/format b/debian/_base/metapackages/meta-kde/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/debian/squeeze/metapackages/meta-kde/debian/source/format
+++ b/debian/_base/metapackages/meta-kde/debian/source/format
diff --git a/debian/squeeze/metapackages/meta-kde/debian/source/options b/debian/_base/metapackages/meta-kde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/metapackages/meta-kde/debian/source/options
+++ b/debian/_base/metapackages/meta-kde/debian/source/options
diff --git a/debian/squeeze/metapackages/sudo-trinity/Makefile b/debian/_base/metapackages/sudo-trinity/Makefile
index bc4653675..bc4653675 100644
--- a/debian/squeeze/metapackages/sudo-trinity/Makefile
+++ b/debian/_base/metapackages/sudo-trinity/Makefile
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/changelog b/debian/_base/metapackages/sudo-trinity/debian/changelog
index 6d79a642a..6d79a642a 100644
--- a/debian/squeeze/metapackages/sudo-trinity/debian/changelog
+++ b/debian/_base/metapackages/sudo-trinity/debian/changelog
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/compat b/debian/_base/metapackages/sudo-trinity/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/metapackages/sudo-trinity/debian/compat
+++ b/debian/_base/metapackages/sudo-trinity/debian/compat
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/control b/debian/_base/metapackages/sudo-trinity/debian/control
index e9314525c..e9314525c 100644
--- a/debian/squeeze/metapackages/sudo-trinity/debian/control
+++ b/debian/_base/metapackages/sudo-trinity/debian/control
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/dirs b/debian/_base/metapackages/sudo-trinity/debian/dirs
index ee19d5d17..ee19d5d17 100644
--- a/debian/squeeze/metapackages/sudo-trinity/debian/dirs
+++ b/debian/_base/metapackages/sudo-trinity/debian/dirs
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/rules b/debian/_base/metapackages/sudo-trinity/debian/rules
index f8c89d5db..f8c89d5db 100755
--- a/debian/squeeze/metapackages/sudo-trinity/debian/rules
+++ b/debian/_base/metapackages/sudo-trinity/debian/rules
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/source/format b/debian/_base/metapackages/sudo-trinity/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/debian/squeeze/metapackages/sudo-trinity/debian/source/format
+++ b/debian/_base/metapackages/sudo-trinity/debian/source/format
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/source/options b/debian/_base/metapackages/sudo-trinity/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/metapackages/sudo-trinity/debian/source/options
+++ b/debian/_base/metapackages/sudo-trinity/debian/source/options
diff --git a/debian/squeeze/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/debian/_base/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/debian/squeeze/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
+++ b/debian/_base/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
diff --git a/debian/squeeze/metapackages/trinity-keyring b/debian/_base/metapackages/trinity-keyring
index be4f36ad9..be4f36ad9 120000
--- a/debian/squeeze/metapackages/trinity-keyring
+++ b/debian/_base/metapackages/trinity-keyring
diff --git a/debian/jessie b/debian/jessie
new file mode 120000
index 000000000..e7c887a6f
--- /dev/null
+++ b/debian/jessie
@@ -0,0 +1 @@
+_base
\ No newline at end of file
diff --git a/debian/squeeze b/debian/squeeze
new file mode 120000
index 000000000..e7c887a6f
--- /dev/null
+++ b/debian/squeeze
@@ -0,0 +1 @@
+_base
\ No newline at end of file
diff --git a/debian/stretch b/debian/stretch
new file mode 120000
index 000000000..e7c887a6f
--- /dev/null
+++ b/debian/stretch
@@ -0,0 +1 @@
+_base
\ No newline at end of file
diff --git a/debian/wheezy b/debian/wheezy
index 20f08b4f4..e7c887a6f 120000
--- a/debian/wheezy
+++ b/debian/wheezy
@@ -1 +1 @@
-squeeze
\ No newline at end of file
+_base
\ No newline at end of file
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 fb1dcd130..fb1dcd130 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 74afe7056..74afe7056 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 75c9add4b..75c9add4b 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 ae5612518..ae5612518 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 a3de6d18c..a3de6d18c 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 35fc0712b..35fc0712b 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 b1e97afac..b1e97afac 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 0be740892..0be740892 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 58496db32..58496db32 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 45dd0cac0..45dd0cac0 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 2618af2fc..2618af2fc 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.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..ca324be99 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/applications/amarok.cmake/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/README.Debian b/ubuntu/_base/applications/amarok.cmake/debian/README.Debian
index 7dc17fb17..7dc17fb17 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/README.Debian
+++ b/ubuntu/_base/applications/amarok.cmake/debian/README.Debian
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-common-trinity.install b/ubuntu/_base/applications/amarok.cmake/debian/amarok-common-trinity.install
index 3b473baa0..3b473baa0 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-common-trinity.install
+++ b/ubuntu/_base/applications/amarok.cmake/debian/amarok-common-trinity.install
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install b/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
index c5e46604f..c5e46604f 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
+++ b/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-xine-trinity.install
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install b/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
index ab71ca6f9..ab71ca6f9 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
+++ b/ubuntu/_base/applications/amarok.cmake/debian/amarok-engine-yauap-trinity.install
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.install b/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.install
index f5aeb567f..f5aeb567f 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.install
+++ b/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.install
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.manpages b/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.manpages
index 8094eebb9..8094eebb9 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.manpages
+++ b/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.manpages
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu b/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.menu
index f78ef6060..f78ef6060 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/ubuntu/_base/applications/amarok.cmake/debian/amarok-trinity.menu
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok_play_audiocd.desktop b/ubuntu/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
index 434630b60..434630b60 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
+++ b/ubuntu/_base/applications/amarok.cmake/debian/amarok_play_audiocd.desktop
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
index 2dff59226..2dff59226 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk b/ubuntu/_base/applications/amarok.cmake/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/amarok.cmake/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/versions.pl b/ubuntu/_base/applications/amarok.cmake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/amarok.cmake/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/changelog b/ubuntu/_base/applications/amarok.cmake/debian/changelog
index dfc13c56b..dfc13c56b 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/changelog
+++ b/ubuntu/_base/applications/amarok.cmake/debian/changelog
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/compat b/ubuntu/_base/applications/amarok.cmake/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/compat
+++ b/ubuntu/_base/applications/amarok.cmake/debian/compat
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/control b/ubuntu/_base/applications/amarok.cmake/debian/control
index 3b2edf097..3b2edf097 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/control
+++ b/ubuntu/_base/applications/amarok.cmake/debian/control
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/copyright b/ubuntu/_base/applications/amarok.cmake/debian/copyright
index 2775890ba..2775890ba 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/copyright
+++ b/ubuntu/_base/applications/amarok.cmake/debian/copyright
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok-16.xpm b/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm
index 80a228f20..80a228f20 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok-16.xpm
+++ b/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok-16.xpm
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok.xpm b/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok.xpm
index 6411e36d0..6411e36d0 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/icons/amarok.xpm
+++ b/ubuntu/_base/applications/amarok.cmake/debian/icons/amarok.xpm
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3 b/ubuntu/_base/applications/amarok.cmake/debian/install-mp3
index 7b06cbd2f..7b06cbd2f 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/install-mp3
+++ b/ubuntu/_base/applications/amarok.cmake/debian/install-mp3
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/kubuntu-media-amarok b/ubuntu/_base/applications/amarok.cmake/debian/kubuntu-media-amarok
index dacf7fc55..dacf7fc55 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/kubuntu-media-amarok
+++ b/ubuntu/_base/applications/amarok.cmake/debian/kubuntu-media-amarok
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/amarok.cmake/debian/man/amarok-trinity.1
index dac3bb8aa..dac3bb8aa 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok-trinity.1
+++ b/ubuntu/_base/applications/amarok.cmake/debian/man/amarok-trinity.1
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1
index c932b9b0c..c932b9b0c 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1
+++ b/ubuntu/_base/applications/amarok.cmake/debian/man/amarok_libvisual-trinity.1
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1
index 0850440dd..0850440dd 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokapp-trinity.1
+++ b/ubuntu/_base/applications/amarok.cmake/debian/man/amarokapp-trinity.1
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1
index f4abfd1b2..f4abfd1b2 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1
+++ b/ubuntu/_base/applications/amarok.cmake/debian/man/amarokcollectionscanner-trinity.1
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/patches/series b/ubuntu/_base/applications/amarok.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/patches/series
+++ b/ubuntu/_base/applications/amarok.cmake/debian/patches/series
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/rules b/ubuntu/_base/applications/amarok.cmake/debian/rules
index ae58dd49c..ae58dd49c 100755
--- a/ubuntu/maverick/applications/amarok.cmake/debian/rules
+++ b/ubuntu/_base/applications/amarok.cmake/debian/rules
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/source/format b/ubuntu/_base/applications/amarok.cmake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/source/format
+++ b/ubuntu/_base/applications/amarok.cmake/debian/source/format
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/source/options b/ubuntu/_base/applications/amarok.cmake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/source/options
+++ b/ubuntu/_base/applications/amarok.cmake/debian/source/options
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/watch b/ubuntu/_base/applications/amarok.cmake/debian/watch
index b0a7420bb..b0a7420bb 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/watch
+++ b/ubuntu/_base/applications/amarok.cmake/debian/watch
diff --git a/ubuntu/maverick/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/amarok/debian/KUBUNTU-DEBIAN-DIFFERENCES
index ca324be99..ca324be99 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 7dc17fb17..7dc17fb17 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 f5aeb567f..f5aeb567f 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 f78ef6060..f78ef6060 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 434630b60..434630b60 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 9551fe7f3..9551fe7f3 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 5ecbf5c3f..5ecbf5c3f 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 7b06cbd2f..7b06cbd2f 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 dac3bb8aa..dac3bb8aa 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 0850440dd..0850440dd 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 f4abfd1b2..f4abfd1b2 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 bea194004..bea194004 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 a24d7e924..a24d7e924 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 46f5a3754..46f5a3754 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 e39578cba..e39578cba 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 36252962d..36252962d 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 a7e14117e..a7e14117e 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 200c5baf7..200c5baf7 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 0592f7738..0592f7738 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 9bbfd7ad9..9bbfd7ad9 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 6b662b132..6b662b132 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 b71192301..b71192301 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 7ba4e395f..7ba4e395f 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 c57001178..c57001178 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-kconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/changelog b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/changelog
index d234636a4..d234636a4 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/changelog
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/changelog
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/compat b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/compat
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/compat
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/control
index f3c4d6682..f3c4d6682 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/control
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/control
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/copyright b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/copyright
index 68f70d9c0..68f70d9c0 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/copyright
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/copyright
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/series b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/patches/series
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/patches/series
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/rules
index cbb918dcb..cbb918dcb 100755
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/rules
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/format b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/format
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/format
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/options b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/source/options
+++ b/ubuntu/_base/applications/compizconfig-backend-kconfig/debian/source/options
diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/changelog b/ubuntu/_base/applications/desktop-effects-kde/debian/changelog
index 4f20cbb6a..4f20cbb6a 100644
--- a/ubuntu/maverick/applications/desktop-effects-kde/debian/changelog
+++ b/ubuntu/_base/applications/desktop-effects-kde/debian/changelog
diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/compat b/ubuntu/_base/applications/desktop-effects-kde/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/desktop-effects-kde/debian/compat
+++ b/ubuntu/_base/applications/desktop-effects-kde/debian/compat
diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/control b/ubuntu/_base/applications/desktop-effects-kde/debian/control
index e5fb4e480..e5fb4e480 100644
--- a/ubuntu/maverick/applications/desktop-effects-kde/debian/control
+++ b/ubuntu/_base/applications/desktop-effects-kde/debian/control
diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/copyright b/ubuntu/_base/applications/desktop-effects-kde/debian/copyright
index b2569f52f..b2569f52f 100644
--- a/ubuntu/maverick/applications/desktop-effects-kde/debian/copyright
+++ b/ubuntu/_base/applications/desktop-effects-kde/debian/copyright
diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install b/ubuntu/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
index e6d16e467..e6d16e467 100644
--- a/ubuntu/maverick/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
+++ b/ubuntu/_base/applications/desktop-effects-kde/debian/desktop-effects-kde-trinity.install
diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/rules b/ubuntu/_base/applications/desktop-effects-kde/debian/rules
index 25fa64a44..25fa64a44 100755
--- a/ubuntu/maverick/applications/desktop-effects-kde/debian/rules
+++ b/ubuntu/_base/applications/desktop-effects-kde/debian/rules
diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/source/format b/ubuntu/_base/applications/desktop-effects-kde/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/desktop-effects-kde/debian/source/format
+++ b/ubuntu/_base/applications/desktop-effects-kde/debian/source/format
diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/source/options b/ubuntu/_base/applications/desktop-effects-kde/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/desktop-effects-kde/debian/source/options
+++ b/ubuntu/_base/applications/desktop-effects-kde/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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 42c8bae54..42c8bae54 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 f5f6fa639..f5f6fa639 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 c4c44e441..c4c44e441 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.install b/ubuntu/_base/applications/digikam/debian/digikam-trinity.install
index 87c7fe33f..87c7fe33f 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 949e0fba8..949e0fba8 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 ed8c640c1..ed8c640c1 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 2d85649a6..2d85649a6 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 d9ff5c47a..d9ff5c47a 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 2c5a6ad20..2c5a6ad20 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 32ce26612..32ce26612 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 2dff59226..2dff59226 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 f5d237249..f5d237249 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 75c9add4b..75c9add4b 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 5a0a63c7d..5a0a63c7d 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 5688d3fe8..5688d3fe8 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/dolphin.1 b/ubuntu/_base/applications/dolphin/debian/dolphin.1
index 2a1a972f0..2a1a972f0 100644
--- a/ubuntu/maverick/applications/dolphin/debian/dolphin.1
+++ b/ubuntu/_base/applications/dolphin/debian/dolphin.1
diff --git a/ubuntu/maverick/applications/dolphin/debian/manpages b/ubuntu/_base/applications/dolphin/debian/manpages
index 8b02277f2..8b02277f2 100644
--- a/ubuntu/maverick/applications/dolphin/debian/manpages
+++ b/ubuntu/_base/applications/dolphin/debian/manpages
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 7b4528041..7b4528041 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-l10n/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk b/ubuntu/_base/applications/filelight-l10n/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/filelight-l10n/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/versions.pl b/ubuntu/_base/applications/filelight-l10n/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/filelight-l10n/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/changelog b/ubuntu/_base/applications/filelight-l10n/debian/changelog
index 1c4c5eee8..1c4c5eee8 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/changelog
+++ b/ubuntu/_base/applications/filelight-l10n/debian/changelog
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/compat b/ubuntu/_base/applications/filelight-l10n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/compat
+++ b/ubuntu/_base/applications/filelight-l10n/debian/compat
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/control b/ubuntu/_base/applications/filelight-l10n/debian/control
index a59186011..a59186011 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/control
+++ b/ubuntu/_base/applications/filelight-l10n/debian/control
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/copyright b/ubuntu/_base/applications/filelight-l10n/debian/copyright
index f840087a2..f840087a2 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/copyright
+++ b/ubuntu/_base/applications/filelight-l10n/debian/copyright
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/patches/series b/ubuntu/_base/applications/filelight-l10n/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/patches/series
+++ b/ubuntu/_base/applications/filelight-l10n/debian/patches/series
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/rules b/ubuntu/_base/applications/filelight-l10n/debian/rules
index 5d3cc2a77..5d3cc2a77 100755
--- a/ubuntu/maverick/applications/filelight-l10n/debian/rules
+++ b/ubuntu/_base/applications/filelight-l10n/debian/rules
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/source/format b/ubuntu/_base/applications/filelight-l10n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/source/format
+++ b/ubuntu/_base/applications/filelight-l10n/debian/source/format
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/source/options b/ubuntu/_base/applications/filelight-l10n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/source/options
+++ b/ubuntu/_base/applications/filelight-l10n/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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 ba8fabc22..ba8fabc22 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 4db4c3f62..4db4c3f62 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 213a5bf3d..213a5bf3d 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 87d875fc9..87d875fc9 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 88040a563..88040a563 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 a34c9c81c..a34c9c81c 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 874f83934..874f83934 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 cf3d30a9a..cf3d30a9a 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 4896faef2..4896faef2 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.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 4e6f9181d..4e6f9181d 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/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
index 3bd77b8f7..3bd77b8f7 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 f5d237249..f5d237249 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 75c9add4b..75c9add4b 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 c7bc196b8..c7bc196b8 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/debiandirs b/ubuntu/_base/applications/gwenview-i18n/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/debiandirs
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/debiandirs
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 05b674469..05b674469 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 2c29a5ee5..2c29a5ee5 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 67d6a0fae..67d6a0fae 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.doc-base b/ubuntu/_base/applications/gwenview/debian/gwenview.doc-base
index 9efaff358..9efaff358 100644
--- a/ubuntu/maverick/applications/gwenview/debian/gwenview.doc-base
+++ b/ubuntu/_base/applications/gwenview/debian/gwenview.doc-base
diff --git a/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian b/ubuntu/_base/applications/gwenview/debian/gwenview.lintian
index e8c71a351..e8c71a351 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 c20d8c34c..c20d8c34c 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 11548ae60..11548ae60 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 8c2643680..8c2643680 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 c1a9a4afc..c1a9a4afc 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 0cf0bd0a6..0cf0bd0a6 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 c1b283bb1..c1b283bb1 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 c60cc6831..c60cc6831 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 2d7d24def..2d7d24def 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 627ed3a24..627ed3a24 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 abbd41f07..abbd41f07 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 8e0b27b98..8e0b27b98 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 f07382ed8..f07382ed8 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 72cf96bb3..72cf96bb3 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 c6f95c029..c6f95c029 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 e18a34c1c..e18a34c1c 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 f5c557815..f5c557815 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 f4f5b0012..f4f5b0012 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 7f8f011eb..7f8f011eb 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 e1c8092d3..e1c8092d3 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 d3fd4d792..d3fd4d792 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 6761a0c33..6761a0c33 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 4f623cb44..4f623cb44 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 08c10c248..08c10c248 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 63b3d1a72..63b3d1a72 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 ffdc18ddd..ffdc18ddd 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 8b7ddae56..8b7ddae56 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 271285c4e..271285c4e 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 c1d407f15..c1d407f15 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 825837cba..825837cba 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 ca6de5bc7..ca6de5bc7 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 25ec5689c..25ec5689c 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 7b4adb8d9..7b4adb8d9 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 a022ecda3..a022ecda3 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 4314c464a..4314c464a 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 1add9ec5d..1add9ec5d 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/katapult/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 8d1218816..8d1218816 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 022850854..022850854 100644
--- a/ubuntu/maverick/applications/katapult/debian/docs
+++ b/ubuntu/_base/applications/katapult/debian/docs
diff --git a/ubuntu/maverick/applications/katapult/debian/katapult.1.docbook b/ubuntu/_base/applications/katapult/debian/katapult.1.docbook
index 718ff8707..718ff8707 100644
--- a/ubuntu/maverick/applications/katapult/debian/katapult.1.docbook
+++ b/ubuntu/_base/applications/katapult/debian/katapult.1.docbook
diff --git a/ubuntu/maverick/applications/katapult/debian/lintian b/ubuntu/_base/applications/katapult/debian/lintian
index af70e7550..af70e7550 100644
--- a/ubuntu/maverick/applications/katapult/debian/lintian
+++ b/ubuntu/_base/applications/katapult/debian/lintian
diff --git a/ubuntu/maverick/applications/katapult/debian/menu b/ubuntu/_base/applications/katapult/debian/menu
index a76f261ac..a76f261ac 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 da2411aad..da2411aad 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 45dff7966..45dff7966 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 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/docs
+++ b/ubuntu/_base/applications/kbarcode/debian/docs
diff --git a/ubuntu/maverick/applications/kbarcode/debian/kbarcode.1 b/ubuntu/_base/applications/kbarcode/debian/kbarcode.1
index 12d3bfaad..12d3bfaad 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/kbarcode.1
+++ b/ubuntu/_base/applications/kbarcode/debian/kbarcode.1
diff --git a/ubuntu/maverick/applications/kbarcode/debian/menu b/ubuntu/_base/applications/kbarcode/debian/menu
index 48b3f8eff..48b3f8eff 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 38399c77f..38399c77f 100755
--- a/ubuntu/maverick/applications/kbarcode/debian/rules
+++ b/ubuntu/_base/applications/kbarcode/debian/rules
diff --git a/ubuntu/maverick/applications/kbarcode/debian/source.lintian-overrides b/ubuntu/_base/applications/kbarcode/debian/source.lintian-overrides
index cb165370f..cb165370f 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/source.lintian-overrides
+++ b/ubuntu/_base/applications/kbarcode/debian/source.lintian-overrides
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/kbarcode/debian/watch b/ubuntu/_base/applications/kbarcode/debian/watch
index f0291570e..f0291570e 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/watch
+++ b/ubuntu/_base/applications/kbarcode/debian/watch
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/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/cmake.mk b/ubuntu/_base/applications/kbfx/debian/cmake.mk
index 4c7e2e24c..4c7e2e24c 100644
--- a/ubuntu/maverick/applications/kbfx/debian/cmake.mk
+++ b/ubuntu/_base/applications/kbfx/debian/cmake.mk
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 82cd6dff8..82cd6dff8 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 11d23df1b..11d23df1b 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.lintian-overrides b/ubuntu/_base/applications/kbfx/debian/kbfx.lintian-overrides
index a2ecfe7dc..a2ecfe7dc 100644
--- a/ubuntu/maverick/applications/kbfx/debian/kbfx.lintian-overrides
+++ b/ubuntu/_base/applications/kbfx/debian/kbfx.lintian-overrides
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 e839edd42..e839edd42 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 cfc9a7d7d..cfc9a7d7d 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 a85448cb6..a85448cb6 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 166765aba..166765aba 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 63d91bc0c..63d91bc0c 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 08dc66d68..08dc66d68 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/kbibtex/debian/watch b/ubuntu/_base/applications/kbibtex/debian/watch
index a0b02fa2d..a0b02fa2d 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/watch
+++ b/ubuntu/_base/applications/kbibtex/debian/watch
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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 3ce16eb96..3ce16eb96 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 50bd824bb..50bd824bb 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 ab7f8c6e7..ab7f8c6e7 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 af3e5e01d..af3e5e01d 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/kbiff/debian/watch b/ubuntu/_base/applications/kbiff/debian/watch
index eb0794476..eb0794476 100644
--- a/ubuntu/maverick/applications/kbiff/debian/watch
+++ b/ubuntu/_base/applications/kbiff/debian/watch
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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 7f8f011eb..7f8f011eb 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 5abe85a00..5abe85a00 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/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 780803d59..780803d59 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 8598644e6..8598644e6 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 7d0864525..7d0864525 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 22e3692f0..22e3692f0 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 00508b25c..00508b25c 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 0fdbf1173..0fdbf1173 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/kcpuload/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 16264ec9d..16264ec9d 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 f87605737..f87605737 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 59af0de31..59af0de31 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 63c61960c..63c61960c 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/docs
+++ b/ubuntu/_base/applications/kcpuload/debian/docs
diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1 b/ubuntu/_base/applications/kcpuload/debian/kcpuload.1
index 0eb630559..0eb630559 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
+++ b/ubuntu/_base/applications/kcpuload/debian/kcpuload.1
diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.install b/ubuntu/_base/applications/kcpuload/debian/kcpuload.install
index d3c2fb81c..d3c2fb81c 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.install
+++ b/ubuntu/_base/applications/kcpuload/debian/kcpuload.install
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 684348e2f..684348e2f 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/menu
+++ b/ubuntu/_base/applications/kcpuload/debian/menu
diff --git a/ubuntu/maverick/applications/kcpuload/debian/override b/ubuntu/_base/applications/kcpuload/debian/override
index e3c6bcea4..e3c6bcea4 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/override
+++ b/ubuntu/_base/applications/kcpuload/debian/override
diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/_base/applications/kcpuload/debian/rules
index bc0e82531..bc0e82531 100755
--- a/ubuntu/maverick/applications/kcpuload/debian/rules
+++ b/ubuntu/_base/applications/kcpuload/debian/rules
diff --git a/ubuntu/maverick/applications/kcpuload/debian/source.lintian-overrides b/ubuntu/_base/applications/kcpuload/debian/source.lintian-overrides
index 417f308dc..417f308dc 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/source.lintian-overrides
+++ b/ubuntu/_base/applications/kcpuload/debian/source.lintian-overrides
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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 656937dc2..656937dc2 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 d3a882bd0..d3a882bd0 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 17bbc9b77..17bbc9b77 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 343c566a3..343c566a3 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/links b/ubuntu/_base/applications/kdbusnotification/debian/links
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/links
+++ b/ubuntu/_base/applications/kdbusnotification/debian/links
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/_base/applications/kdbusnotification/debian/rules
index 2750f623d..2750f623d 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/kde-guidance/debian/README.Debian b/ubuntu/_base/applications/kde-guidance/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/README.Debian
+++ b/ubuntu/_base/applications/kde-guidance/debian/README.Debian
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/changelog b/ubuntu/_base/applications/kde-guidance/debian/changelog
index fbd50fb8f..fbd50fb8f 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/changelog
+++ b/ubuntu/_base/applications/kde-guidance/debian/changelog
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/compat b/ubuntu/_base/applications/kde-guidance/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/compat
+++ b/ubuntu/_base/applications/kde-guidance/debian/compat
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/control b/ubuntu/_base/applications/kde-guidance/debian/control
index 836aad023..836aad023 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/control
+++ b/ubuntu/_base/applications/kde-guidance/debian/control
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/copyright b/ubuntu/_base/applications/kde-guidance/debian/copyright
index 38c1d30e8..38c1d30e8 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/copyright
+++ b/ubuntu/_base/applications/kde-guidance/debian/copyright
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/dirs b/ubuntu/_base/applications/kde-guidance/debian/dirs
index 3dd0bc793..3dd0bc793 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/dirs
+++ b/ubuntu/_base/applications/kde-guidance/debian/dirs
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/displayconfig-trinity.1 b/ubuntu/_base/applications/kde-guidance/debian/displayconfig-trinity.1
index 3670902b8..3670902b8 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/displayconfig-trinity.1
+++ b/ubuntu/_base/applications/kde-guidance/debian/displayconfig-trinity.1
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/docs b/ubuntu/_base/applications/kde-guidance/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/docs
+++ b/ubuntu/_base/applications/kde-guidance/debian/docs
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/guidance-backends-trinity.install b/ubuntu/_base/applications/kde-guidance/debian/guidance-backends-trinity.install
index de6cbc63e..de6cbc63e 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/guidance-backends-trinity.install
+++ b/ubuntu/_base/applications/kde-guidance/debian/guidance-backends-trinity.install
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
index 8c707520e..8c707520e 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
+++ b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.init b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.init
index 30a3854d1..30a3854d1 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.init
+++ b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.init
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.install b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.install
index ddf96826a..ddf96826a 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.install
+++ b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.install
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
index 6131946c2..6131946c2 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.postinst b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst
index de2804fc4..de2804fc4 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.postinst
+++ b/ubuntu/_base/applications/kde-guidance/debian/kde-guidance-trinity.postinst
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/mountconfig-trinity.1 b/ubuntu/_base/applications/kde-guidance/debian/mountconfig-trinity.1
index 7f1fb728c..7f1fb728c 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/mountconfig-trinity.1
+++ b/ubuntu/_base/applications/kde-guidance/debian/mountconfig-trinity.1
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/patches/series b/ubuntu/_base/applications/kde-guidance/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/patches/series
+++ b/ubuntu/_base/applications/kde-guidance/debian/patches/series
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/pycompat b/ubuntu/_base/applications/kde-guidance/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/pycompat
+++ b/ubuntu/_base/applications/kde-guidance/debian/pycompat
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk
index 1a1ec9a8e..1a1ec9a8e 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/python-distutils-jaunty.mk
+++ b/ubuntu/_base/applications/kde-guidance/debian/python-distutils-jaunty.mk
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/pyversions b/ubuntu/_base/applications/kde-guidance/debian/pyversions
index b3dc41ebc..b3dc41ebc 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/pyversions
+++ b/ubuntu/_base/applications/kde-guidance/debian/pyversions
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/rules b/ubuntu/_base/applications/kde-guidance/debian/rules
index 48e5e31d7..48e5e31d7 100755
--- a/ubuntu/maverick/applications/kde-guidance/debian/rules
+++ b/ubuntu/_base/applications/kde-guidance/debian/rules
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/_base/applications/kde-guidance/debian/serviceconfig-trinity.1
index 776a01998..776a01998 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/serviceconfig-trinity.1
+++ b/ubuntu/_base/applications/kde-guidance/debian/serviceconfig-trinity.1
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/source/format b/ubuntu/_base/applications/kde-guidance/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/source/format
+++ b/ubuntu/_base/applications/kde-guidance/debian/source/format
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/source/options b/ubuntu/_base/applications/kde-guidance/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/source/options
+++ b/ubuntu/_base/applications/kde-guidance/debian/source/options
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/userconfig-trinity.1 b/ubuntu/_base/applications/kde-guidance/debian/userconfig-trinity.1
index 3b950add1..3b950add1 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/userconfig-trinity.1
+++ b/ubuntu/_base/applications/kde-guidance/debian/userconfig-trinity.1
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/watch b/ubuntu/_base/applications/kde-guidance/debian/watch
index 19912c171..19912c171 100644
--- a/ubuntu/maverick/applications/kde-guidance/debian/watch
+++ b/ubuntu/_base/applications/kde-guidance/debian/watch
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/changelog b/ubuntu/_base/applications/kde-style-lipstik/debian/changelog
index 8df3a0424..8df3a0424 100644
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/changelog
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/changelog
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/compat b/ubuntu/_base/applications/kde-style-lipstik/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/compat
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/compat
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/control b/ubuntu/_base/applications/kde-style-lipstik/debian/control
index 3ea18fee8..3ea18fee8 100644
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/control
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/control
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/copyright b/ubuntu/_base/applications/kde-style-lipstik/debian/copyright
index 446318fca..446318fca 100644
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/copyright
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/copyright
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/dirs b/ubuntu/_base/applications/kde-style-lipstik/debian/dirs
index 43e7f554c..43e7f554c 100644
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/dirs
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/dirs
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/docs b/ubuntu/_base/applications/kde-style-lipstik/debian/docs
index 0948b8ef4..0948b8ef4 100644
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/docs
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/docs
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/patches/.gitignore b/ubuntu/_base/applications/kde-style-lipstik/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/rules b/ubuntu/_base/applications/kde-style-lipstik/debian/rules
index 620265e8e..620265e8e 100755
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/rules
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/rules
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/source/format b/ubuntu/_base/applications/kde-style-lipstik/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/source/format
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/source/format
diff --git a/ubuntu/maverick/applications/kde-style-lipstik/debian/source/options b/ubuntu/_base/applications/kde-style-lipstik/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kde-style-lipstik/debian/source/options
+++ b/ubuntu/_base/applications/kde-style-lipstik/debian/source/options
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/kde.mk b/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/versions.pl b/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/changelog b/ubuntu/_base/applications/kde-style-qtcurve/debian/changelog
index b89b8bc90..b89b8bc90 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/changelog
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/changelog
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/compat b/ubuntu/_base/applications/kde-style-qtcurve/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/compat
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/compat
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/control b/ubuntu/_base/applications/kde-style-qtcurve/debian/control
index 4d67825b0..4d67825b0 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/control
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/control
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/copyright b/ubuntu/_base/applications/kde-style-qtcurve/debian/copyright
index 055d8a659..055d8a659 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/copyright
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/copyright
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/docs b/ubuntu/_base/applications/kde-style-qtcurve/debian/docs
index 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/docs
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/docs
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install b/ubuntu/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
index 003761370..003761370 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/series b/ubuntu/_base/applications/kde-style-qtcurve/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/patches/series
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/patches/series
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules b/ubuntu/_base/applications/kde-style-qtcurve/debian/rules
index 52bf17ae4..52bf17ae4 100755
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/rules
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/scan-version b/ubuntu/_base/applications/kde-style-qtcurve/debian/scan-version
index 640ea27c7..640ea27c7 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/scan-version
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/scan-version
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/source/format b/ubuntu/_base/applications/kde-style-qtcurve/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/source/format
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/source/format
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/source/options b/ubuntu/_base/applications/kde-style-qtcurve/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/source/options
+++ b/ubuntu/_base/applications/kde-style-qtcurve/debian/source/options
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/kde.mk b/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/versions.pl b/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/changelog b/ubuntu/_base/applications/kde-systemsettings/debian/changelog
index 932e17449..932e17449 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/changelog
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/changelog
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/compat b/ubuntu/_base/applications/kde-systemsettings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/compat
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/compat
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/control b/ubuntu/_base/applications/kde-systemsettings/debian/control
index a781f7401..a781f7401 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/control
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/control
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/copyright b/ubuntu/_base/applications/kde-systemsettings/debian/copyright
index 04a4bdce1..04a4bdce1 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/copyright
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/copyright
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/docs b/ubuntu/_base/applications/kde-systemsettings/debian/docs
index 0eb1e7d11..0eb1e7d11 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/docs
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/docs
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/kde-settings-laptops.directory b/ubuntu/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory
index 687a493c4..687a493c4 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/kde-settings-laptops.directory
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/kde-settings-laptops.directory
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst b/ubuntu/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
index f7b840ea2..f7b840ea2 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/kde-systemsettings-trinity.preinst
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/patches/series b/ubuntu/_base/applications/kde-systemsettings/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/patches/series
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/patches/series
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/rules b/ubuntu/_base/applications/kde-systemsettings/debian/rules
index e1f09b5cc..e1f09b5cc 100755
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/rules
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/rules
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/source/format b/ubuntu/_base/applications/kde-systemsettings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/source/format
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/source/format
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/source/options b/ubuntu/_base/applications/kde-systemsettings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/source/options
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/source/options
diff --git a/ubuntu/maverick/applications/kde-systemsettings/debian/systemsettings.1.docbook b/ubuntu/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook
index 2b260e626..2b260e626 100644
--- a/ubuntu/maverick/applications/kde-systemsettings/debian/systemsettings.1.docbook
+++ b/ubuntu/_base/applications/kde-systemsettings/debian/systemsettings.1.docbook
diff --git a/ubuntu/maverick/applications/kdesudo/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kdesudo/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kdesudo/debian/cdbs/kde.mk b/ubuntu/_base/applications/kdesudo/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kdesudo/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kdesudo/debian/cdbs/versions.pl b/ubuntu/_base/applications/kdesudo/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kdesudo/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kdesudo/debian/changelog b/ubuntu/_base/applications/kdesudo/debian/changelog
index d245ff2e7..d245ff2e7 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/changelog
+++ b/ubuntu/_base/applications/kdesudo/debian/changelog
diff --git a/ubuntu/maverick/applications/kdesudo/debian/compat b/ubuntu/_base/applications/kdesudo/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/compat
+++ b/ubuntu/_base/applications/kdesudo/debian/compat
diff --git a/ubuntu/maverick/applications/kdesudo/debian/control b/ubuntu/_base/applications/kdesudo/debian/control
index 2af9662b6..2af9662b6 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/control
+++ b/ubuntu/_base/applications/kdesudo/debian/control
diff --git a/ubuntu/maverick/applications/kdesudo/debian/copyright b/ubuntu/_base/applications/kdesudo/debian/copyright
index 9cd32407b..9cd32407b 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/copyright
+++ b/ubuntu/_base/applications/kdesudo/debian/copyright
diff --git a/ubuntu/maverick/applications/kdesudo/debian/kdesudo-trinity.1.docbook b/ubuntu/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook
index 0e1ba2b60..0e1ba2b60 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/kdesudo-trinity.1.docbook
+++ b/ubuntu/_base/applications/kdesudo/debian/kdesudo-trinity.1.docbook
diff --git a/ubuntu/maverick/applications/kdesudo/debian/links b/ubuntu/_base/applications/kdesudo/debian/links
index c30adf9c1..c30adf9c1 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/links
+++ b/ubuntu/_base/applications/kdesudo/debian/links
diff --git a/ubuntu/maverick/applications/kdesudo/debian/patches/series b/ubuntu/_base/applications/kdesudo/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/patches/series
+++ b/ubuntu/_base/applications/kdesudo/debian/patches/series
diff --git a/ubuntu/maverick/applications/kdesudo/debian/postinst b/ubuntu/_base/applications/kdesudo/debian/postinst
index 7ec0ace2f..7ec0ace2f 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/postinst
+++ b/ubuntu/_base/applications/kdesudo/debian/postinst
diff --git a/ubuntu/maverick/applications/kdesudo/debian/postrm b/ubuntu/_base/applications/kdesudo/debian/postrm
index 526a8c60a..526a8c60a 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/postrm
+++ b/ubuntu/_base/applications/kdesudo/debian/postrm
diff --git a/ubuntu/maverick/applications/kdesudo/debian/preinst b/ubuntu/_base/applications/kdesudo/debian/preinst
index 4ce843004..4ce843004 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/preinst
+++ b/ubuntu/_base/applications/kdesudo/debian/preinst
diff --git a/ubuntu/maverick/applications/kdesudo/debian/rules b/ubuntu/_base/applications/kdesudo/debian/rules
index f5cd38f63..f5cd38f63 100755
--- a/ubuntu/maverick/applications/kdesudo/debian/rules
+++ b/ubuntu/_base/applications/kdesudo/debian/rules
diff --git a/ubuntu/maverick/applications/kdesudo/debian/source/format b/ubuntu/_base/applications/kdesudo/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/source/format
+++ b/ubuntu/_base/applications/kdesudo/debian/source/format
diff --git a/ubuntu/maverick/applications/kdesudo/debian/source/options b/ubuntu/_base/applications/kdesudo/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kdesudo/debian/source/options
+++ b/ubuntu/_base/applications/kdesudo/debian/source/options
diff --git a/ubuntu/maverick/applications/kdesvn/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
index 5510d9d2a..5510d9d2a 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kdesvn/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kdesvn/debian/cdbs/kde.mk b/ubuntu/_base/applications/kdesvn/debian/cdbs/kde.mk
index b8d83b930..b8d83b930 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kdesvn/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kdesvn/debian/cdbs/versions.pl b/ubuntu/_base/applications/kdesvn/debian/cdbs/versions.pl
index 9ce11d8a3..9ce11d8a3 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kdesvn/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kdesvn/debian/changelog b/ubuntu/_base/applications/kdesvn/debian/changelog
index c3e74b6d9..c3e74b6d9 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/changelog
+++ b/ubuntu/_base/applications/kdesvn/debian/changelog
diff --git a/ubuntu/maverick/applications/kdesvn/debian/compat b/ubuntu/_base/applications/kdesvn/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/compat
+++ b/ubuntu/_base/applications/kdesvn/debian/compat
diff --git a/ubuntu/maverick/applications/kdesvn/debian/control b/ubuntu/_base/applications/kdesvn/debian/control
index 80c8d4f82..80c8d4f82 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/control
+++ b/ubuntu/_base/applications/kdesvn/debian/control
diff --git a/ubuntu/maverick/applications/kdesvn/debian/copyright b/ubuntu/_base/applications/kdesvn/debian/copyright
index a3d664a33..a3d664a33 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/copyright
+++ b/ubuntu/_base/applications/kdesvn/debian/copyright
diff --git a/ubuntu/maverick/applications/kdesvn/debian/docs b/ubuntu/_base/applications/kdesvn/debian/docs
index ca0272abf..ca0272abf 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/docs
+++ b/ubuntu/_base/applications/kdesvn/debian/docs
diff --git a/ubuntu/maverick/applications/kdesvn/debian/icons/kdesvn.xpm b/ubuntu/_base/applications/kdesvn/debian/icons/kdesvn.xpm
index d5e2abf6a..d5e2abf6a 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/icons/kdesvn.xpm
+++ b/ubuntu/_base/applications/kdesvn/debian/icons/kdesvn.xpm
diff --git a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install b/ubuntu/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
index 44c022ef7..44c022ef7 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
+++ b/ubuntu/_base/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.install b/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.install
index 546d35034..546d35034 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.install
+++ b/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.install
diff --git a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.manpages b/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.manpages
index c834c876c..c834c876c 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.manpages
+++ b/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.manpages
diff --git a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.menu b/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.menu
index c85d2665d..c85d2665d 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/kdesvn-trinity.menu
+++ b/ubuntu/_base/applications/kdesvn/debian/kdesvn-trinity.menu
diff --git a/ubuntu/maverick/applications/kdesvn/debian/libsvnqt-trinity-dev.install b/ubuntu/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install
index fb3c81018..fb3c81018 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/libsvnqt-trinity-dev.install
+++ b/ubuntu/_base/applications/kdesvn/debian/libsvnqt-trinity-dev.install
diff --git a/ubuntu/maverick/applications/kdesvn/debian/libsvnqt4-trinity.install b/ubuntu/_base/applications/kdesvn/debian/libsvnqt4-trinity.install
index fcfe51754..fcfe51754 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/libsvnqt4-trinity.install
+++ b/ubuntu/_base/applications/kdesvn/debian/libsvnqt4-trinity.install
diff --git a/ubuntu/maverick/applications/kdesvn/debian/man/kdesvn.1 b/ubuntu/_base/applications/kdesvn/debian/man/kdesvn.1
index 0e4816669..0e4816669 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/man/kdesvn.1
+++ b/ubuntu/_base/applications/kdesvn/debian/man/kdesvn.1
diff --git a/ubuntu/maverick/applications/kdesvn/debian/man/kdesvnaskpass.1 b/ubuntu/_base/applications/kdesvn/debian/man/kdesvnaskpass.1
index 4cc8f03ad..4cc8f03ad 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/man/kdesvnaskpass.1
+++ b/ubuntu/_base/applications/kdesvn/debian/man/kdesvnaskpass.1
diff --git a/ubuntu/maverick/applications/kdesvn/debian/patches/series b/ubuntu/_base/applications/kdesvn/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/patches/series
+++ b/ubuntu/_base/applications/kdesvn/debian/patches/series
diff --git a/ubuntu/maverick/applications/kdesvn/debian/rules b/ubuntu/_base/applications/kdesvn/debian/rules
index 74c5fe7ec..74c5fe7ec 100755
--- a/ubuntu/maverick/applications/kdesvn/debian/rules
+++ b/ubuntu/_base/applications/kdesvn/debian/rules
diff --git a/ubuntu/maverick/applications/kdesvn/debian/source/format b/ubuntu/_base/applications/kdesvn/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/source/format
+++ b/ubuntu/_base/applications/kdesvn/debian/source/format
diff --git a/ubuntu/maverick/applications/kdesvn/debian/source/options b/ubuntu/_base/applications/kdesvn/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/source/options
+++ b/ubuntu/_base/applications/kdesvn/debian/source/options
diff --git a/ubuntu/maverick/applications/kdesvn/debian/watch b/ubuntu/_base/applications/kdesvn/debian/watch
index 190c9f8f7..190c9f8f7 100644
--- a/ubuntu/maverick/applications/kdesvn/debian/watch
+++ b/ubuntu/_base/applications/kdesvn/debian/watch
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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 6bb333671..6bb333671 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 014004a26..014004a26 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 6d9c9dd9a..6d9c9dd9a 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 e3fbe7781..e3fbe7781 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 00e22f353..00e22f353 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 6eaa4064f..6eaa4064f 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 9181b1148..9181b1148 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 61124427a..61124427a 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/kdirstat.1 b/ubuntu/_base/applications/kdirstat/debian/kdirstat.1
index e58ff535c..e58ff535c 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/kdirstat.1
+++ b/ubuntu/_base/applications/kdirstat/debian/kdirstat.1
diff --git a/ubuntu/maverick/applications/kdirstat/debian/kdirstat.manpages b/ubuntu/_base/applications/kdirstat/debian/kdirstat.manpages
index 3e4bf7ff8..3e4bf7ff8 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/kdirstat.manpages
+++ b/ubuntu/_base/applications/kdirstat/debian/kdirstat.manpages
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 1e16df51a..1e16df51a 100755
--- a/ubuntu/maverick/applications/kdirstat/debian/rules
+++ b/ubuntu/_base/applications/kdirstat/debian/rules
diff --git a/ubuntu/maverick/applications/kdirstat/debian/source.lintian-overrides b/ubuntu/_base/applications/kdirstat/debian/source.lintian-overrides
index aad24dd30..aad24dd30 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/source.lintian-overrides
+++ b/ubuntu/_base/applications/kdirstat/debian/source.lintian-overrides
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/kdirstat/debian/watch b/ubuntu/_base/applications/kdirstat/debian/watch
index 6dc72cf03..6dc72cf03 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/watch
+++ b/ubuntu/_base/applications/kdirstat/debian/watch
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/README.Debian b/ubuntu/_base/applications/kdmtheme/debian/README.Debian
index 1291b6a32..1291b6a32 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/README.Debian
+++ b/ubuntu/_base/applications/kdmtheme/debian/README.Debian
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kdmtheme/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/kde.mk b/ubuntu/_base/applications/kdmtheme/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kdmtheme/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/versions.pl b/ubuntu/_base/applications/kdmtheme/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kdmtheme/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/changelog b/ubuntu/_base/applications/kdmtheme/debian/changelog
index e14e2952b..e14e2952b 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/changelog
+++ b/ubuntu/_base/applications/kdmtheme/debian/changelog
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/compat b/ubuntu/_base/applications/kdmtheme/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/compat
+++ b/ubuntu/_base/applications/kdmtheme/debian/compat
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/control b/ubuntu/_base/applications/kdmtheme/debian/control
index c87bd3a51..c87bd3a51 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/control
+++ b/ubuntu/_base/applications/kdmtheme/debian/control
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/copyright b/ubuntu/_base/applications/kdmtheme/debian/copyright
index 23265e2b6..23265e2b6 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/copyright
+++ b/ubuntu/_base/applications/kdmtheme/debian/copyright
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/docs b/ubuntu/_base/applications/kdmtheme/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/docs
+++ b/ubuntu/_base/applications/kdmtheme/debian/docs
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/ubuntu/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides
index d033183c7..d033183c7 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides
+++ b/ubuntu/_base/applications/kdmtheme/debian/kdmtheme.lintian-overrides
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/patches/.gitignore b/ubuntu/_base/applications/kdmtheme/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/kdmtheme/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/rules b/ubuntu/_base/applications/kdmtheme/debian/rules
index b8b31a90b..b8b31a90b 100755
--- a/ubuntu/maverick/applications/kdmtheme/debian/rules
+++ b/ubuntu/_base/applications/kdmtheme/debian/rules
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/source/format b/ubuntu/_base/applications/kdmtheme/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/source/format
+++ b/ubuntu/_base/applications/kdmtheme/debian/source/format
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/source/options b/ubuntu/_base/applications/kdmtheme/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/source/options
+++ b/ubuntu/_base/applications/kdmtheme/debian/source/options
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/watch b/ubuntu/_base/applications/kdmtheme/debian/watch
index 5cf8d8c80..5cf8d8c80 100644
--- a/ubuntu/maverick/applications/kdmtheme/debian/watch
+++ b/ubuntu/_base/applications/kdmtheme/debian/watch
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 2d228856c..2d228856c 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 6ca73edad..6ca73edad 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 0325170a5..0325170a5 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 0325170a5..0325170a5 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 8293bfe64..8293bfe64 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 c9bd14917..c9bd14917 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 31432279d..31432279d 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 55238c41a..55238c41a 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 e2718e364..e2718e364 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/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 b1ab98588..b1ab98588 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 49eb68460..49eb68460 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 4ee3f268e..4ee3f268e 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 bc560f754..bc560f754 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 d7f3f3649..d7f3f3649 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 98c4063a3..98c4063a3 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 d86250261..d86250261 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/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 75c9add4b..75c9add4b 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 7f9ad6c07..7f9ad6c07 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 8e55c77bc..8e55c77bc 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 bbfc0d8dd..bbfc0d8dd 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 5fc398065..5fc398065 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 605268a27..605268a27 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 3d82db5d5..3d82db5d5 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 bbcde5836..bbcde5836 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 8ddf08ad7..8ddf08ad7 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 c4115ba16..c4115ba16 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 7ddaad218..7ddaad218 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 27a3fe333..27a3fe333 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/kio-apt/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk b/ubuntu/_base/applications/kio-apt/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kio-apt/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kio-apt/debian/cdbs/versions.pl b/ubuntu/_base/applications/kio-apt/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kio-apt/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kio-apt/debian/changelog b/ubuntu/_base/applications/kio-apt/debian/changelog
index 1b3d932c4..1b3d932c4 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/changelog
+++ b/ubuntu/_base/applications/kio-apt/debian/changelog
diff --git a/ubuntu/maverick/applications/kio-apt/debian/compat b/ubuntu/_base/applications/kio-apt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/compat
+++ b/ubuntu/_base/applications/kio-apt/debian/compat
diff --git a/ubuntu/maverick/applications/kio-apt/debian/control b/ubuntu/_base/applications/kio-apt/debian/control
index 553b55468..553b55468 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/control
+++ b/ubuntu/_base/applications/kio-apt/debian/control
diff --git a/ubuntu/maverick/applications/kio-apt/debian/copyright b/ubuntu/_base/applications/kio-apt/debian/copyright
index b461d84ed..b461d84ed 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/copyright
+++ b/ubuntu/_base/applications/kio-apt/debian/copyright
diff --git a/ubuntu/maverick/applications/kio-apt/debian/docs b/ubuntu/_base/applications/kio-apt/debian/docs
index 62deb0497..62deb0497 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/docs
+++ b/ubuntu/_base/applications/kio-apt/debian/docs
diff --git a/ubuntu/maverick/applications/kio-apt/debian/fixrpath b/ubuntu/_base/applications/kio-apt/debian/fixrpath
index 0ca44359e..0ca44359e 100755
--- a/ubuntu/maverick/applications/kio-apt/debian/fixrpath
+++ b/ubuntu/_base/applications/kio-apt/debian/fixrpath
diff --git a/ubuntu/maverick/applications/kio-apt/debian/kdedeb_logo.png.uu b/ubuntu/_base/applications/kio-apt/debian/kdedeb_logo.png.uu
index 85ac9ca79..85ac9ca79 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/kdedeb_logo.png.uu
+++ b/ubuntu/_base/applications/kio-apt/debian/kdedeb_logo.png.uu
diff --git a/ubuntu/maverick/applications/kio-apt/debian/patches/series b/ubuntu/_base/applications/kio-apt/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/patches/series
+++ b/ubuntu/_base/applications/kio-apt/debian/patches/series
diff --git a/ubuntu/maverick/applications/kio-apt/debian/rules b/ubuntu/_base/applications/kio-apt/debian/rules
index db5da700b..db5da700b 100755
--- a/ubuntu/maverick/applications/kio-apt/debian/rules
+++ b/ubuntu/_base/applications/kio-apt/debian/rules
diff --git a/ubuntu/maverick/applications/kio-apt/debian/source/format b/ubuntu/_base/applications/kio-apt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/source/format
+++ b/ubuntu/_base/applications/kio-apt/debian/source/format
diff --git a/ubuntu/maverick/applications/kio-apt/debian/source/options b/ubuntu/_base/applications/kio-apt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/source/options
+++ b/ubuntu/_base/applications/kio-apt/debian/source/options
diff --git a/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
index 68dca1718..68dca1718 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk b/ubuntu/_base/applications/kio-locate/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kio-locate/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kio-locate/debian/cdbs/versions.pl b/ubuntu/_base/applications/kio-locate/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kio-locate/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kio-locate/debian/changelog b/ubuntu/_base/applications/kio-locate/debian/changelog
index 6fe22089e..6fe22089e 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/changelog
+++ b/ubuntu/_base/applications/kio-locate/debian/changelog
diff --git a/ubuntu/maverick/applications/kio-locate/debian/compat b/ubuntu/_base/applications/kio-locate/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/compat
+++ b/ubuntu/_base/applications/kio-locate/debian/compat
diff --git a/ubuntu/maverick/applications/kio-locate/debian/control b/ubuntu/_base/applications/kio-locate/debian/control
index 127e577bf..127e577bf 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/control
+++ b/ubuntu/_base/applications/kio-locate/debian/control
diff --git a/ubuntu/maverick/applications/kio-locate/debian/copyright b/ubuntu/_base/applications/kio-locate/debian/copyright
index 17e1fdc15..17e1fdc15 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/copyright
+++ b/ubuntu/_base/applications/kio-locate/debian/copyright
diff --git a/ubuntu/maverick/applications/kio-locate/debian/patches/series b/ubuntu/_base/applications/kio-locate/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/patches/series
+++ b/ubuntu/_base/applications/kio-locate/debian/patches/series
diff --git a/ubuntu/maverick/applications/kio-locate/debian/rules b/ubuntu/_base/applications/kio-locate/debian/rules
index 09b22dcb0..09b22dcb0 100755
--- a/ubuntu/maverick/applications/kio-locate/debian/rules
+++ b/ubuntu/_base/applications/kio-locate/debian/rules
diff --git a/ubuntu/maverick/applications/kio-locate/debian/source/format b/ubuntu/_base/applications/kio-locate/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/source/format
+++ b/ubuntu/_base/applications/kio-locate/debian/source/format
diff --git a/ubuntu/maverick/applications/kio-locate/debian/source/options b/ubuntu/_base/applications/kio-locate/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/source/options
+++ b/ubuntu/_base/applications/kio-locate/debian/source/options
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/versions.pl b/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/changelog b/ubuntu/_base/applications/kio-umountwrapper/debian/changelog
index 44969da09..44969da09 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/changelog
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/changelog
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/compat b/ubuntu/_base/applications/kio-umountwrapper/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/compat
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/compat
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/control b/ubuntu/_base/applications/kio-umountwrapper/debian/control
index 36e03611f..36e03611f 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/control
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/control
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/copyright b/ubuntu/_base/applications/kio-umountwrapper/debian/copyright
index 08e471ac6..08e471ac6 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/copyright
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/copyright
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/media_safelyremove.desktop b/ubuntu/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop
index 970caf8a5..970caf8a5 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/media_safelyremove.desktop
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/media_safelyremove.desktop
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/patches/series b/ubuntu/_base/applications/kio-umountwrapper/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/patches/series
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/patches/series
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/postrm b/ubuntu/_base/applications/kio-umountwrapper/debian/postrm
index 2baeddc3e..2baeddc3e 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/postrm
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/postrm
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/preinst b/ubuntu/_base/applications/kio-umountwrapper/debian/preinst
index 78e02c765..78e02c765 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/preinst
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/preinst
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules b/ubuntu/_base/applications/kio-umountwrapper/debian/rules
index 4f91d9a74..4f91d9a74 100755
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/rules
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/source/format b/ubuntu/_base/applications/kio-umountwrapper/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/source/format
+++ b/ubuntu/_base/applications/kio-umountwrapper/debian/source/format
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/source/options b/ubuntu/_base/applications/kio-umountwrapper/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/source/options
+++ b/ubuntu/_base/applications/kio-umountwrapper/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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 a81e4659e..a81e4659e 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 1005343c6..1005343c6 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/kiosktool-kdedirs-trinity.1 b/ubuntu/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
index 62faad5d3..62faad5d3 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
+++ b/ubuntu/_base/applications/kiosktool/debian/kiosktool-kdedirs-trinity.1
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.1
index 08ba2ec80..08ba2ec80 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1
+++ b/ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.1
diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.manpages
index 2d009e1db..2d009e1db 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages
+++ b/ubuntu/_base/applications/kiosktool/debian/kiosktool-trinity.manpages
diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff b/ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
index 77f7d912f..77f7d912f 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
+++ b/ubuntu/_base/applications/kiosktool/debian/patches/kubuntu_02_kmenu.diff
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 d850db3da..d850db3da 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 f33e94505..f33e94505 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 677edd830..677edd830 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/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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 6084762a7..6084762a7 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 81325a35f..81325a35f 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 3c2a5f5ff..3c2a5f5ff 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 eda152760..eda152760 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 444b60fb5..444b60fb5 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 5327ea0ac..5327ea0ac 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/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 0ed896170..0ed896170 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 be68a9592..be68a9592 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 77922f4b4..77922f4b4 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 31560bd7b..31560bd7b 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 379235132..379235132 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 3d1feab6e..3d1feab6e 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 d03f14f42..d03f14f42 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 ff799841f..ff799841f 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 5d9752bb1..5d9752bb1 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 4c3b73990..4c3b73990 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 89ecca2de..89ecca2de 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 3a6b25af8..3a6b25af8 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 31b6f6332..31b6f6332 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 fe6f4765f..fe6f4765f 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 26f39cdc0..26f39cdc0 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 57855aec4..57855aec4 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 3b66fe478..3b66fe478 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/changelog b/ubuntu/_base/applications/knetload/debian/changelog
index f5456314d..f5456314d 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 3a8741921..3a8741921 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 43e7f554c..43e7f554c 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-trinity.manpages b/ubuntu/_base/applications/knetload/debian/knetload-trinity.manpages
index b0a6ac166..b0a6ac166 100644
--- a/ubuntu/maverick/applications/knetload/debian/knetload-trinity.manpages
+++ b/ubuntu/_base/applications/knetload/debian/knetload-trinity.manpages
diff --git a/ubuntu/maverick/applications/knetload/debian/knetload.1 b/ubuntu/_base/applications/knetload/debian/knetload.1
index 30b6c4e4d..30b6c4e4d 100644
--- a/ubuntu/maverick/applications/knetload/debian/knetload.1
+++ b/ubuntu/_base/applications/knetload/debian/knetload.1
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 a39b37e3c..a39b37e3c 100644
--- a/ubuntu/maverick/applications/knetload/debian/menu
+++ b/ubuntu/_base/applications/knetload/debian/menu
diff --git a/ubuntu/maverick/applications/knetload/debian/rules b/ubuntu/_base/applications/knetload/debian/rules
index 0a65d48d8..0a65d48d8 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 8cf7ca6c3..8cf7ca6c3 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/knetstats.1.docbook b/ubuntu/_base/applications/knetstats/debian/knetstats.1.docbook
index 28b721f53..28b721f53 100644
--- a/ubuntu/maverick/applications/knetstats/debian/knetstats.1.docbook
+++ b/ubuntu/_base/applications/knetstats/debian/knetstats.1.docbook
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 a19b60c8d..a19b60c8d 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/knetstats/debian/watch b/ubuntu/_base/applications/knetstats/debian/watch
index 8d12f40b0..8d12f40b0 100644
--- a/ubuntu/maverick/applications/knetstats/debian/watch
+++ b/ubuntu/_base/applications/knetstats/debian/watch
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/README.source b/ubuntu/_base/applications/knetworkmanager.cmake/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/README.source
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/README.source
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
index 2dff59226..2dff59226 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk b/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog b/ubuntu/_base/applications/knetworkmanager.cmake/debian/changelog
index ed0d32a81..ed0d32a81 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/changelog
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/changelog
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/compat b/ubuntu/_base/applications/knetworkmanager.cmake/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/compat
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/compat
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control b/ubuntu/_base/applications/knetworkmanager.cmake/debian/control
index f8466b606..f8466b606 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/control
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/control
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/copyright b/ubuntu/_base/applications/knetworkmanager.cmake/debian/copyright
index 2490de254..2490de254 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/copyright
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/copyright
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/knetworkmanager.1 b/ubuntu/_base/applications/knetworkmanager.cmake/debian/knetworkmanager.1
index 3cd261c89..3cd261c89 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/knetworkmanager.1
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/knetworkmanager.1
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/manpages b/ubuntu/_base/applications/knetworkmanager.cmake/debian/manpages
index e2859341f..e2859341f 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/manpages
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/manpages
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/menu b/ubuntu/_base/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..9775e9c7c 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/menu
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/menu
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
index 9ae01a92b..9ae01a92b 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst b/ubuntu/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst
index fdd4e51ca..fdd4e51ca 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/patches/series b/ubuntu/_base/applications/knetworkmanager.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/patches/series
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/patches/series
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/rules b/ubuntu/_base/applications/knetworkmanager.cmake/debian/rules
index 4a5e56fb5..4a5e56fb5 100755
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/rules
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/rules
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/format b/ubuntu/_base/applications/knetworkmanager.cmake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/format
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/source/format
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/options b/ubuntu/_base/applications/knetworkmanager.cmake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/source/options
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/source/options
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/watch b/ubuntu/_base/applications/knetworkmanager.cmake/debian/watch
index ad7a7be91..ad7a7be91 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/watch
+++ b/ubuntu/_base/applications/knetworkmanager.cmake/debian/watch
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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 c65f5ff4a..c65f5ff4a 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 eb044b0d2..eb044b0d2 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 3cd261c89..3cd261c89 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 9775e9c7c..9775e9c7c 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 9ae01a92b..9ae01a92b 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 ee316c12f..ee316c12f 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/changelog b/ubuntu/_base/applications/knights/debian/changelog
index 5dfb85e8c..5dfb85e8c 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 23ddf0014..23ddf0014 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/debiandirs b/ubuntu/_base/applications/knights/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/ubuntu/maverick/applications/knights/debian/debiandirs
+++ b/ubuntu/_base/applications/knights/debian/debiandirs
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/knights.1 b/ubuntu/_base/applications/knights/debian/knights.1
index d66f50342..d66f50342 100644
--- a/ubuntu/maverick/applications/knights/debian/knights.1
+++ b/ubuntu/_base/applications/knights/debian/knights.1
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 f2f72ca74..f2f72ca74 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 bde510e8b..bde510e8b 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/knights/debian/watch b/ubuntu/_base/applications/knights/debian/watch
index e3fef441b..e3fef441b 100644
--- a/ubuntu/maverick/applications/knights/debian/watch
+++ b/ubuntu/_base/applications/knights/debian/watch
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 98e1f9552..98e1f9552 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/knowit.1 b/ubuntu/_base/applications/knowit/debian/knowit.1
index a19da8be1..a19da8be1 100644
--- a/ubuntu/maverick/applications/knowit/debian/knowit.1
+++ b/ubuntu/_base/applications/knowit/debian/knowit.1
diff --git a/ubuntu/maverick/applications/knowit/debian/rules b/ubuntu/_base/applications/knowit/debian/rules
index 77f1d05a4..77f1d05a4 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/knowit/debian/watch b/ubuntu/_base/applications/knowit/debian/watch
index 0c83833f0..0c83833f0 100644
--- a/ubuntu/maverick/applications/knowit/debian/watch
+++ b/ubuntu/_base/applications/knowit/debian/watch
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 cc2bd0116..cc2bd0116 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/knutclient.1x b/ubuntu/_base/applications/knutclient/debian/knutclient.1x
index 231658277..231658277 100644
--- a/ubuntu/maverick/applications/knutclient/debian/knutclient.1x
+++ b/ubuntu/_base/applications/knutclient/debian/knutclient.1x
diff --git a/ubuntu/maverick/applications/knutclient/debian/knutclient.menu b/ubuntu/_base/applications/knutclient/debian/knutclient.menu
index a520f80ba..a520f80ba 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 a009dbf98..a009dbf98 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 f0d1f9757..f0d1f9757 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 be68a9592..be68a9592 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 478c97b9d..478c97b9d 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 7d9888658..7d9888658 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 cdfe0a8ea..cdfe0a8ea 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 a37b11ace..a37b11ace 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 909a9062a..909a9062a 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 a36c77eb8..a36c77eb8 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 ef467a3e1..ef467a3e1 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 2354092d2..2354092d2 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 8ce61b75e..8ce61b75e 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 37d242ddf..37d242ddf 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 669e5d49d..669e5d49d 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 f399de402..f399de402 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 0329fc505..0329fc505 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 fa077706a..fa077706a 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 ab998f150..ab998f150 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 cc59b8a8f..cc59b8a8f 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 f81d8d6f7..f81d8d6f7 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 405e19fec..405e19fec 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 0b2c8a4c3..0b2c8a4c3 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 fb80fb2bc..fb80fb2bc 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 07d1301aa..07d1301aa 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 bfd5bb7e5..bfd5bb7e5 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 0ec37116a..0ec37116a 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 ec8c2f644..ec8c2f644 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 37f699400..37f699400 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 801df0727..801df0727 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 02f3c0322..02f3c0322 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 4eb29a57e..4eb29a57e 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 510c85320..510c85320 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 00d1d2875..00d1d2875 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 db45a4245..db45a4245 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 0ae1aa215..0ae1aa215 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 95eab71a2..95eab71a2 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 eb49daa16..eb49daa16 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 2f17354e2..2f17354e2 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-dev-trinity.install b/ubuntu/_base/applications/koffice/debian/koffice-dev-trinity.install
index c65cbd3d3..c65cbd3d3 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
+++ b/ubuntu/_base/applications/koffice/debian/koffice-dev-trinity.install
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 8d1ecc1d3..8d1ecc1d3 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-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 f6b06085b..f6b06085b 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 7d5f525a3..7d5f525a3 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 9517c3f74..9517c3f74 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 a6670c1ae..a6670c1ae 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 073ee53ab..073ee53ab 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 ec838c038..ec838c038 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 2213dc554..2213dc554 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 c4b1bc359..c4b1bc359 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 5237efd72..5237efd72 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 bd6bdfd66..bd6bdfd66 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 3322113fc..3322113fc 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 0756d2647..0756d2647 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 d1142abfb..d1142abfb 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 fc90edce6..fc90edce6 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 2445c57ce..2445c57ce 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 52bff66e1..52bff66e1 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 7eb96d7f2..7eb96d7f2 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 697074b1e..697074b1e 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 eee4ef24f..eee4ef24f 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 370d6a7f9..370d6a7f9 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 8a6987024..8a6987024 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 3ae324559..3ae324559 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 c5190eb05..c5190eb05 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 ba2ff8197..ba2ff8197 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 e2e0f4256..e2e0f4256 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 f5fba2153..f5fba2153 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 b293d0016..b293d0016 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 fd3e6b053..fd3e6b053 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 99a9264f1..99a9264f1 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 a0cd38a78..a0cd38a78 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 c378a94a1..c378a94a1 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 c3903a3d1..c3903a3d1 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 32f9e2f9c..32f9e2f9c 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 34a1f7f57..34a1f7f57 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 14ad609c3..14ad609c3 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 d003812cd..d003812cd 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 a187698f4..a187698f4 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 2dfdc2579..2dfdc2579 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 c191e2978..c191e2978 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 372998f85..372998f85 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 bdb599f0f..bdb599f0f 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 2104b84e6..2104b84e6 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 cb5c85c8e..cb5c85c8e 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 ca10af6cf..ca10af6cf 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 13cdaf4b2..13cdaf4b2 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 0fbd13937..0fbd13937 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 f48e27b95..f48e27b95 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 1752d7b2c..1752d7b2c 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 61643f3ff..61643f3ff 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 4731c9d8b..4731c9d8b 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 3c342bcfc..3c342bcfc 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/Makefile.am b/ubuntu/_base/applications/kpicosim/debian/Makefile.am
index 5de86e2c3..5de86e2c3 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/Makefile.am
+++ b/ubuntu/_base/applications/kpicosim/debian/Makefile.am
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 f6d653ecd..f6d653ecd 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/dirs b/ubuntu/_base/applications/kpicosim/debian/dirs
index ca882bbb7..ca882bbb7 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/dirs
+++ b/ubuntu/_base/applications/kpicosim/debian/dirs
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/kpicosim-trinity.manpages b/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.manpages
index 046bd32dd..046bd32dd 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.manpages
+++ b/ubuntu/_base/applications/kpicosim/debian/kpicosim-trinity.manpages
diff --git a/ubuntu/maverick/applications/kpicosim/debian/kpicosim.1 b/ubuntu/_base/applications/kpicosim/debian/kpicosim.1
index 5557b20a8..5557b20a8 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/kpicosim.1
+++ b/ubuntu/_base/applications/kpicosim/debian/kpicosim.1
diff --git a/ubuntu/maverick/applications/kpicosim/debian/menu b/ubuntu/_base/applications/kpicosim/debian/menu
index 12de54d49..12de54d49 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 98b6ba69e..98b6ba69e 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/kpicosim/debian/watch b/ubuntu/_base/applications/kpicosim/debian/watch
index fc0a7c717..fc0a7c717 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/watch
+++ b/ubuntu/_base/applications/kpicosim/debian/watch
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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 e4fcd9ea5..e4fcd9ea5 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/rules b/ubuntu/_base/applications/kpilot/debian/rules
index 3c342bcfc..3c342bcfc 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.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
index 2dff59226..2dff59226 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk b/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/versions.pl b/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog b/ubuntu/_base/applications/kpowersave.cmake/debian/changelog
index c23417124..c23417124 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/changelog
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/compat b/ubuntu/_base/applications/kpowersave.cmake/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/compat
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/compat
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/control b/ubuntu/_base/applications/kpowersave.cmake/debian/control
index 7a4166104..7a4166104 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/control
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/control
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/copyright b/ubuntu/_base/applications/kpowersave.cmake/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/copyright
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/copyright
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/install b/ubuntu/_base/applications/kpowersave.cmake/debian/install
index 4a1194bd1..4a1194bd1 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/install
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/install
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
index 4d9818595..4d9818595 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index b0c32f61e..b0c32f61e 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.1 b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.1
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.1
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.xpm b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.xpm
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/kpowersave.xpm
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/manpages b/ubuntu/_base/applications/kpowersave.cmake/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/manpages
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/manpages
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/menu b/ubuntu/_base/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..6ae0f9833 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/menu
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/menu
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/series b/ubuntu/_base/applications/kpowersave.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/series
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/patches/series
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/postrm b/ubuntu/_base/applications/kpowersave.cmake/debian/postrm
index 4e8eda799..4e8eda799 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/postrm
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/postrm
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/preinst b/ubuntu/_base/applications/kpowersave.cmake/debian/preinst
index b007ccf90..b007ccf90 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/preinst
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/preinst
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/rules b/ubuntu/_base/applications/kpowersave.cmake/debian/rules
index f84c79ba9..f84c79ba9 100755
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/rules
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/source/format b/ubuntu/_base/applications/kpowersave.cmake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/source/format
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/source/format
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/source/options b/ubuntu/_base/applications/kpowersave.cmake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/source/options
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/source/options
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/watch b/ubuntu/_base/applications/kpowersave.cmake/debian/watch
index 832285e63..832285e63 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/watch
+++ b/ubuntu/_base/applications/kpowersave.cmake/debian/watch
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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 d9b8099ef..d9b8099ef 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 de64d2033..de64d2033 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 652f468f2..652f468f2 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 b0c32f61e..b0c32f61e 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 0ab1d6f90..0ab1d6f90 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 0dbd62cc4..0dbd62cc4 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/postrm b/ubuntu/_base/applications/kpowersave/debian/postrm
index 4e8eda799..4e8eda799 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 d0eb1227c..d0eb1227c 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 1575fca96..1575fca96 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/kradio/debian/changelog b/ubuntu/_base/applications/kradio/debian/changelog
index ad7c7832c..ad7c7832c 100644
--- a/ubuntu/maverick/applications/kradio/debian/changelog
+++ b/ubuntu/_base/applications/kradio/debian/changelog
diff --git a/ubuntu/maverick/applications/kradio/debian/compat b/ubuntu/_base/applications/kradio/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kradio/debian/compat
+++ b/ubuntu/_base/applications/kradio/debian/compat
diff --git a/ubuntu/maverick/applications/kradio/debian/control b/ubuntu/_base/applications/kradio/debian/control
index fae9088c4..fae9088c4 100644
--- a/ubuntu/maverick/applications/kradio/debian/control
+++ b/ubuntu/_base/applications/kradio/debian/control
diff --git a/ubuntu/maverick/applications/kradio/debian/convert-presets.1 b/ubuntu/_base/applications/kradio/debian/convert-presets.1
index 1f605127f..1f605127f 100644
--- a/ubuntu/maverick/applications/kradio/debian/convert-presets.1
+++ b/ubuntu/_base/applications/kradio/debian/convert-presets.1
diff --git a/ubuntu/maverick/applications/kradio/debian/copyright b/ubuntu/_base/applications/kradio/debian/copyright
index 932ce3d04..932ce3d04 100644
--- a/ubuntu/maverick/applications/kradio/debian/copyright
+++ b/ubuntu/_base/applications/kradio/debian/copyright
diff --git a/ubuntu/maverick/applications/kradio/debian/docs b/ubuntu/_base/applications/kradio/debian/docs
index bc4a4e465..bc4a4e465 100644
--- a/ubuntu/maverick/applications/kradio/debian/docs
+++ b/ubuntu/_base/applications/kradio/debian/docs
diff --git a/ubuntu/maverick/applications/kradio/debian/kradio.1 b/ubuntu/_base/applications/kradio/debian/kradio.1
index 3b715d05d..3b715d05d 100644
--- a/ubuntu/maverick/applications/kradio/debian/kradio.1
+++ b/ubuntu/_base/applications/kradio/debian/kradio.1
diff --git a/ubuntu/maverick/applications/kradio/debian/manpages b/ubuntu/_base/applications/kradio/debian/manpages
index f37e7cfcf..f37e7cfcf 100644
--- a/ubuntu/maverick/applications/kradio/debian/manpages
+++ b/ubuntu/_base/applications/kradio/debian/manpages
diff --git a/ubuntu/maverick/applications/kradio/debian/menu b/ubuntu/_base/applications/kradio/debian/menu
index 9c29dc73c..9c29dc73c 100644
--- a/ubuntu/maverick/applications/kradio/debian/menu
+++ b/ubuntu/_base/applications/kradio/debian/menu
diff --git a/ubuntu/maverick/applications/kradio/debian/rules b/ubuntu/_base/applications/kradio/debian/rules
index f3c1f73d7..f3c1f73d7 100755
--- a/ubuntu/maverick/applications/kradio/debian/rules
+++ b/ubuntu/_base/applications/kradio/debian/rules
diff --git a/ubuntu/maverick/applications/kradio/debian/source/format b/ubuntu/_base/applications/kradio/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kradio/debian/source/format
+++ b/ubuntu/_base/applications/kradio/debian/source/format
diff --git a/ubuntu/maverick/applications/kradio/debian/source/options b/ubuntu/_base/applications/kradio/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kradio/debian/source/options
+++ b/ubuntu/_base/applications/kradio/debian/source/options
diff --git a/ubuntu/maverick/applications/kradio/debian/watch b/ubuntu/_base/applications/kradio/debian/watch
index 49f735f61..49f735f61 100644
--- a/ubuntu/maverick/applications/kradio/debian/watch
+++ b/ubuntu/_base/applications/kradio/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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 88bdc9c08..88bdc9c08 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 724e08449..724e08449 100644
--- a/ubuntu/maverick/applications/krename/debian/docs
+++ b/ubuntu/_base/applications/krename/debian/docs
diff --git a/ubuntu/maverick/applications/krename/debian/krename.1 b/ubuntu/_base/applications/krename/debian/krename.1
index 153c74797..153c74797 100644
--- a/ubuntu/maverick/applications/krename/debian/krename.1
+++ b/ubuntu/_base/applications/krename/debian/krename.1
diff --git a/ubuntu/maverick/applications/krename/debian/krename.manpages b/ubuntu/_base/applications/krename/debian/krename.manpages
index ded8f6473..ded8f6473 100644
--- a/ubuntu/maverick/applications/krename/debian/krename.manpages
+++ b/ubuntu/_base/applications/krename/debian/krename.manpages
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 404787210..404787210 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/krename/debian/watch b/ubuntu/_base/applications/krename/debian/watch
index 47a31479a..47a31479a 100644
--- a/ubuntu/maverick/applications/krename/debian/watch
+++ b/ubuntu/_base/applications/krename/debian/watch
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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 33154f756..33154f756 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 4d00a07a5..4d00a07a5 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 127bd8f63..127bd8f63 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 ab5986658..ab5986658 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 92d07892f..92d07892f 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 eb772b614..eb772b614 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/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 26aa2ac82..26aa2ac82 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/debiandirs b/ubuntu/_base/applications/ksplash-engine-moodin/debian/debiandirs
index 0e561941d..0e561941d 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/debiandirs
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/dirs b/ubuntu/_base/applications/ksplash-engine-moodin/debian/dirs
index 29183d0bc..29183d0bc 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 2e7053e8b..2e7053e8b 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 7c478322f..7c478322f 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 f771c0a05..f771c0a05 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 a291256f6..a291256f6 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 b5fafd432..b5fafd432 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 b409a6be0..b409a6be0 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 9ae6cbe73..9ae6cbe73 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 cb9dc49ae..cb9dc49ae 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 7f166ced2..7f166ced2 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 f412afcd4..f412afcd4 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 57aa688f9..57aa688f9 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 2ba30f9a0..2ba30f9a0 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 283fadf39..283fadf39 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 9cc731bec..9cc731bec 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 2b39b1c4e..2b39b1c4e 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 226deb2e6..226deb2e6 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 8d468de83..8d468de83 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 ad4ae5ec0..ad4ae5ec0 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 6ee5ee935..6ee5ee935 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 cdfe0a8ea..cdfe0a8ea 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 a82f9b70b..a82f9b70b 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 e17085f05..e17085f05 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 f9b49424b..f9b49424b 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 df3bef893..df3bef893 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 c156cee8b..c156cee8b 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 c407ee57c..c407ee57c 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 dd274dba5..dd274dba5 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 4d17d621c..4d17d621c 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 2675eae4e..2675eae4e 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 e8c53e5db..e8c53e5db 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 889d5878f..889d5878f 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 8e7fb990a..8e7fb990a 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 fd6afdc77..fd6afdc77 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 ae66752f1..ae66752f1 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 4efb6507f..4efb6507f 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 994dd3e0e..994dd3e0e 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 b/ubuntu/_base/applications/kvirc/debian/overrides/kvirc
index dc125fd2e..dc125fd2e 100644
--- a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc
+++ b/ubuntu/_base/applications/kvirc/debian/overrides/kvirc
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 3a8490e65..3a8490e65 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 8636ecb37..8636ecb37 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 ce13cbccb..ce13cbccb 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/patches/.gitignore b/ubuntu/_base/applications/kvkbd/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/patches/.gitignore
+++ b/ubuntu/_base/applications/kvkbd/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kvkbd/debian/rules b/ubuntu/_base/applications/kvkbd/debian/rules
index 6abecd47a..6abecd47a 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/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/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 092b0090a..092b0090a 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/cdbs/kde.mk b/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/cdbs/versions.pl b/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/cdbs/versions.pl
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/changelog b/ubuntu/_base/applications/kwin-style-crystal/debian/changelog
index acdd7341d..acdd7341d 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/changelog
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/changelog
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/compat b/ubuntu/_base/applications/kwin-style-crystal/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/compat
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/compat
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/control b/ubuntu/_base/applications/kwin-style-crystal/debian/control
index 67118b2a7..67118b2a7 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/control
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/control
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/copyright b/ubuntu/_base/applications/kwin-style-crystal/debian/copyright
index dbb28c22d..dbb28c22d 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/copyright
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/copyright
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/dirs b/ubuntu/_base/applications/kwin-style-crystal/debian/dirs
index cbf4aa905..cbf4aa905 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/dirs
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/dirs
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/docs b/ubuntu/_base/applications/kwin-style-crystal/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/docs
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/docs
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/patches/series b/ubuntu/_base/applications/kwin-style-crystal/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/patches/series
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/patches/series
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/rules b/ubuntu/_base/applications/kwin-style-crystal/debian/rules
index 2546c8657..2546c8657 100755
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/rules
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/rules
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/source/format b/ubuntu/_base/applications/kwin-style-crystal/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/source/format
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/source/format
diff --git a/ubuntu/maverick/applications/kwin-style-crystal/debian/source/options b/ubuntu/_base/applications/kwin-style-crystal/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kwin-style-crystal/debian/source/options
+++ b/ubuntu/_base/applications/kwin-style-crystal/debian/source/options
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 5d4aef796..5d4aef796 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 5144c002c..5144c002c 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 bf328cb78..bf328cb78 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 4fd3da4c2..4fd3da4c2 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/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 ad63842b1..ad63842b1 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.1 b/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.1
index ef8dc8b59..ef8dc8b59 100644
--- a/ubuntu/maverick/applications/potracegui/debian/potracegui-trinity.1
+++ b/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.1
diff --git a/ubuntu/maverick/applications/potracegui/debian/potracegui-trinity.menu b/ubuntu/_base/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..ec42ba351 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 fdda3113f..fdda3113f 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/potracegui/debian/watch b/ubuntu/_base/applications/potracegui/debian/watch
index ecb7330aa..ecb7330aa 100644
--- a/ubuntu/maverick/applications/potracegui/debian/watch
+++ b/ubuntu/_base/applications/potracegui/debian/watch
diff --git a/ubuntu/maverick/applications/rosegarden/debian/README.Debian b/ubuntu/_base/applications/rosegarden/debian/README.Debian
index 0719da93f..0719da93f 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 5510d9d2a..5510d9d2a 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 b8d83b930..b8d83b930 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 9ce11d8a3..9ce11d8a3 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 c91341594..c91341594 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 e1e502242..e1e502242 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 df2a7e77d..df2a7e77d 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/copyright
+++ b/ubuntu/_base/applications/rosegarden/debian/copyright
diff --git a/ubuntu/maverick/applications/rosegarden/debian/lintianoverrides b/ubuntu/_base/applications/rosegarden/debian/lintianoverrides
index 135ea69e9..135ea69e9 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/lintianoverrides
+++ b/ubuntu/_base/applications/rosegarden/debian/lintianoverrides
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.menu b/ubuntu/_base/applications/rosegarden/debian/rosegarden-trinity.menu
index ca56a8f26..ca56a8f26 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 91916b271..91916b271 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 03a24f92b..03a24f92b 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 b6b766909..b6b766909 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 100755
--- 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 100755
--- 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 c18647ee8..c18647ee8 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 100755
--- 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 fe74e584a..fe74e584a 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 842e0017d..842e0017d 100755
--- 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 aa842f771..aa842f771 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 6e0b8010e..6e0b8010e 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 7f7c9cb2a..7f7c9cb2a 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 c6b04fa37..c6b04fa37 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 079784d5b..079784d5b 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 528d4f0bb..528d4f0bb 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 ce5932a76..ce5932a76 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 0f6801b72..0f6801b72 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/tellico/debian/changelog b/ubuntu/_base/applications/tellico/debian/changelog
index e8f8697e8..e8f8697e8 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 4c3306ba5..4c3306ba5 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 430884153..430884153 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 4dfb7936d..4dfb7936d 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 152ef011b..152ef011b 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.1x b/ubuntu/_base/applications/tellico/debian/tellico.1x
index e102af2c5..e102af2c5 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/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 75c9add4b..75c9add4b 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 69859afc3..69859afc3 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 9517092c6..9517092c6 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 57855aec4..57855aec4 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 fb021a15b..fb021a15b 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 dc43a7b0f..dc43a7b0f 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 85f0e1b9f..85f0e1b9f 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 ffb14a61e..ffb14a61e 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/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 f86dc62d5..f86dc62d5 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.1 b/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.1
index 7b404d01e..7b404d01e 100644
--- a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.1
+++ b/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.1
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.manpages b/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.manpages
index f9a1365b5..f9a1365b5 100644
--- a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.manpages
+++ b/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.manpages
diff --git a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.menu b/ubuntu/_base/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..80d76482b 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/kubuntu-default-settings/Makefile b/ubuntu/_base/defaultsettings/kubuntu-default-settings/Makefile
index 7dd1aca30..7dd1aca30 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/kdm-theme-cartoon-no-userlist/Dialog.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/Dialog.png
index 3e4862941..3e4862941 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/Dialog.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
index e55edf3cf..e55edf3cf 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/gpl.txt b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/gpl.txt
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/kubuntu.xml b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/kubuntu.xml
index e6b628f3c..e6b628f3c 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/preview.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/preview.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon-no-userlist/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/Dialog.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/Dialog.png
index bd4437f97..bd4437f97 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/Dialog.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/GdmGreeterTheme.desktop
index 8263c2b25..8263c2b25 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/gpl.txt b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/gpl.txt
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/kubuntu.xml b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/kubuntu.xml
index 00caadbbb..00caadbbb 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/preview.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/preview.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme-cartoon/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/entries b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/entries
index 4901a8e82..4901a8e82 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/entries
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/entries
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/Dialog.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/Dialog.png.svn-base
index 5e9587e65..5e9587e65 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/Dialog.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/Dialog.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_normal.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_normal.png.svn-base
index 5e9587e65..5e9587e65 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_normal.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_normal.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_over.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_over.png.svn-base
index 5e9587e65..5e9587e65 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_over.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_over.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_pressed.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_pressed.png.svn-base
index 5e9587e65..5e9587e65 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_pressed.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/enter_pressed.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/preview.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/preview.png.svn-base
index 5e9587e65..5e9587e65 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/preview.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/preview.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_normal.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_normal.png.svn-base
index 5e9587e65..5e9587e65 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_normal.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_normal.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_over.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_over.png.svn-base
index 5e9587e65..5e9587e65 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_over.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_over.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_pressed.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_pressed.png.svn-base
index 5e9587e65..5e9587e65 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_pressed.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/prop-base/system_pressed.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/Dialog.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/Dialog.png.svn-base
index 440bf6f43..440bf6f43 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/Dialog.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/Dialog.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/GdmGreeterTheme.desktop.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/GdmGreeterTheme.desktop.svn-base
index d50678db4..d50678db4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/GdmGreeterTheme.desktop.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/GdmGreeterTheme.desktop.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/Makefile.am.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/Makefile.am.svn-base
index 02b0dee99..02b0dee99 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/Makefile.am.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/Makefile.am.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_normal.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_normal.png.svn-base
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_normal.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_normal.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_over.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_over.png.svn-base
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_over.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_over.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_pressed.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_pressed.png.svn-base
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_pressed.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enter_pressed.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enterprise.xml.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enterprise.xml.svn-base
index 42e37f890..42e37f890 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enterprise.xml.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/enterprise.xml.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/gpl.txt.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/gpl.txt.svn-base
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/gpl.txt.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/gpl.txt.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/preview.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/preview.png.svn-base
index f7712d7d2..f7712d7d2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/preview.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/preview.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_normal.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_normal.png.svn-base
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_normal.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_normal.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_over.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_over.png.svn-base
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_over.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_over.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_pressed.png.svn-base b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_pressed.png.svn-base
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_pressed.png.svn-base
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/.svn/text-base/system_pressed.png.svn-base
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/Dialog.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/Dialog.png
index 440bf6f43..440bf6f43 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/Dialog.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/GdmGreeterTheme.desktop
index d50678db4..d50678db4 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/Makefile.am b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/Makefile.am
index 02b0dee99..02b0dee99 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/Makefile.am
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/Makefile.am
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enterprise.xml b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enterprise.xml
index 42e37f890..42e37f890 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enterprise.xml
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/enterprise.xml
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/gpl.txt b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/gpl.txt
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/preview.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/preview.png
index f7712d7d2..f7712d7d2 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/preview.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/preview.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_normal.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_normal.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_over.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_over.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_pressed.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/kdm-theme/system_pressed.png
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 100755
--- 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 cfc4f99e9..cfc4f99e9 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/throbber/16x16/kde.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kde.png
index 5f4f1a9fb..5f4f1a9fb 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kde.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/22x22/kde.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kde.png
index e6f1e0bf6..e6f1e0bf6 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kde.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/32x32/kde.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kde.png
index f763d6bbb..f763d6bbb 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kde.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/48x48/kde.png b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kde.png
index d441f58bf..d441f58bf 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kde.png
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/gear.3ds b/ubuntu/_base/defaultsettings/kubuntu-default-settings/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 9a1f38a2b..9a1f38a2b 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 a542d6fc8..a542d6fc8 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 bc1a0cd44..bc1a0cd44 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/kubuntu-default-settings-trinity.postinst b/ubuntu/_base/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postinst
index 3c6ed630e..3c6ed630e 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 ec63a6444..ec63a6444 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 89ae9db8f..89ae9db8f 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/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 a34c9c81c..a34c9c81c 100755
--- 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/hal/20-ntfs-config-write-policy.fdi b/ubuntu/_base/defaultsettings/kubuntu-default-settings/hal/20-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal/20-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/hal/20-ntfs-config-write-policy.fdi
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/_base/defaultsettings/kubuntu-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/hal/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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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-profile/kde-user-profile b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-profile/kde-user-profile
index 647a34e46..647a34e46 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kde-user-profile
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-profile/kde-user-profile
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kde4rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-profile/kde4rc
index d08a1fe0b..d08a1fe0b 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kde4rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-profile/kde4rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kderc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-profile/kderc
index c2f5a61e6..c2f5a61e6 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kderc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-profile/kderc
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 10fd37bab..10fd37bab 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 d12811dd2..d12811dd2 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/khtmlrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/khtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/khtmlrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/khtmlrc
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/kio_httprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kio_httprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kio_httprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/klaunchrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/klaunchrc
index ac8e4ce06..ac8e4ce06 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/klaunchrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/klaunchrc
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 e8f5cac9c..e8f5cac9c 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 308f64ad9..308f64ad9 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/kwalletrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kwalletrc
index 326194cb6..326194cb6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwalletrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kwalletrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwincrystalrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kwincrystalrc
index 280fdc386..280fdc386 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwincrystalrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kwincrystalrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwinrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kwinrc
index 28953c47a..28953c47a 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kwinrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde-rc-files/kwinrc
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 8935dcd5c..8935dcd5c 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 0cba16e75..0cba16e75 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/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 a7b4e4167..a7b4e4167 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 a7d794744..a7d794744 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/khtmlrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/khtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/khtmlrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/khtmlrc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kio_httprc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kio_httprc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kio_httprc
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/kwalletrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwalletrc
index 326194cb6..326194cb6 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwalletrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kwalletrc
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/kdmdistrc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kdmdistrc
index 89f477f55..89f477f55 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kdmdistrc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kdmdistrc
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 100755
--- 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 da8f97f73..da8f97f73 100755
--- 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 888d12e8d..888d12e8d 100755
--- 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 100755
--- 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/khtml_browser.rc b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/khtml_browser.rc
index 2eab2a321..2eab2a321 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kpart-rc-files/khtml_browser.rc
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kpart-rc-files/khtml_browser.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 100755
--- 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/kwallet-default-wallet/kdewallet.kwl b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kwallet-default-wallet/kdewallet.kwl
index 485b2e683..485b2e683 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kwallet-default-wallet/kdewallet.kwl
+++ b/ubuntu/_base/defaultsettings/kubuntu-default-settings/kwallet-default-wallet/kdewallet.kwl
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 b8a1f6a57..b8a1f6a57 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 55a07116b..55a07116b 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 2a65951e3..2a65951e3 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 4fe4ad21d..4fe4ad21d 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 9833cee92..9833cee92 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 a9d55c0c5..a9d55c0c5 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 76ff0d62a..76ff0d62a 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 e9ab5c907..e9ab5c907 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 6947dfad6..6947dfad6 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 c3ca52731..c3ca52731 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 bfdfd8830..bfdfd8830 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 9865b07b9..9865b07b9 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 fc22d2bb5..fc22d2bb5 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 35f9d7388..35f9d7388 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 9ced52953..9ced52953 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 8e1c1856d..8e1c1856d 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 8889183bd..8889183bd 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 ef34b8220..ef34b8220 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 37d355b52..37d355b52 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 e6e3ecf95..e6e3ecf95 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 bffb80bde..bffb80bde 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/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 0d228eb78..0d228eb78 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/kdm-theme-no-userlist/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/Dialog.png
index 801c4882a..801c4882a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/GdmGreeterTheme.desktop
index d1507f55f..d1507f55f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/kubuntu.xml b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/kubuntu.xml
index 03b3a5e29..03b3a5e29 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme-no-userlist/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/Dialog.png
index 4ad6c8ab4..4ad6c8ab4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/GdmGreeterTheme.desktop
index dcbca7a27..dcbca7a27 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/kubuntu.xml b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/kubuntu.xml
index 00caadbbb..00caadbbb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/kdm-theme/system_pressed.png
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 100755
--- 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/throbber/16x16/kde.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kde.png
index 5f4f1a9fb..5f4f1a9fb 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kde.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/22x22/kde.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kde.png
index e6f1e0bf6..e6f1e0bf6 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kde.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/32x32/kde.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kde.png
index f763d6bbb..f763d6bbb 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kde.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/48x48/kde.png b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kde.png
index d441f58bf..d441f58bf 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kde.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/gear.3ds b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100755
--- 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 e52cd6221..e52cd6221 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 7f5d76dff..7f5d76dff 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 cf264196c..cf264196c 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 0fdfbf2aa..0fdfbf2aa 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/redmond-default-settings-trinity.postinst b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
index fc0689446..fc0689446 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 3727a65c1..3727a65c1 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 ec63a6444..ec63a6444 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 89ae9db8f..89ae9db8f 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/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 aae3f8a04..aae3f8a04 100755
--- 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 874f83934..874f83934 100755
--- 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/hal/20-ntfs-config-write-policy.fdi b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/hal/20-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal/20-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/hal/20-ntfs-config-write-policy.fdi
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/hal/hal-policy-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal/hal-policy-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/hal/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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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-profile/kde-user-profile b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-profile/kde-user-profile
index 647a34e46..647a34e46 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kde-user-profile
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-profile/kde-user-profile
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kde4rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-profile/kde4rc
index 454fa83f3..454fa83f3 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kde4rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-profile/kde4rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kderc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-profile/kderc
index df5ec9dc6..df5ec9dc6 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kderc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-profile/kderc
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 3995909f1..3995909f1 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 7259a697e..7259a697e 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 10fd37bab..10fd37bab 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 54d5dc921..54d5dc921 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 b36d5b88b..b36d5b88b 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/khtmlrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/khtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/khtmlrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/khtmlrc
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 21b161943..21b161943 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/kio_httprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kio_httprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/klaunchrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/klaunchrc
index 1ca985896..1ca985896 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/klaunchrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/klaunchrc
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 e8f5cac9c..e8f5cac9c 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 100755
--- 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/kwalletrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwalletrc
index 326194cb6..326194cb6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwalletrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwalletrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwincrystalrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwincrystalrc
index 3368a104a..3368a104a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwincrystalrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwincrystalrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwinrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwinrc
index f7b25ef97..f7b25ef97 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde-rc-files/kwinrc
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 45e8ef43f..45e8ef43f 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 0cba16e75..0cba16e75 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/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 a7b4e4167..a7b4e4167 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 897bed37a..897bed37a 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/khtmlrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/khtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/khtmlrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/khtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kio_httprc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kio_httprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kio_httprc
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/kwalletrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwalletrc
index 326194cb6..326194cb6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwalletrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kwalletrc
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/kdmdistrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kdmdistrc
index bba205066..bba205066 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kdmdistrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kdmdistrc
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/xcompmgrrc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kompmgr-rc-files/xcompmgrrc
index 9d201d296..9d201d296 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 100755
--- 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 da8f97f73..da8f97f73 100755
--- 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 888d12e8d..888d12e8d 100755
--- 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 100755
--- 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/khtml_browser.rc b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/khtml_browser.rc
index 2eab2a321..2eab2a321 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kpart-rc-files/khtml_browser.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kpart-rc-files/khtml_browser.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 100755
--- 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/kwallet-default-wallet/kdewallet.kwl b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kwallet-default-wallet/kdewallet.kwl
index 485b2e683..485b2e683 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kwallet-default-wallet/kdewallet.kwl
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings-ii/kwallet-default-wallet/kdewallet.kwl
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 b8a1f6a57..b8a1f6a57 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 55a07116b..55a07116b 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 2a65951e3..2a65951e3 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 4fe4ad21d..4fe4ad21d 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 9833cee92..9833cee92 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 a9d55c0c5..a9d55c0c5 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 76ff0d62a..76ff0d62a 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 e9ab5c907..e9ab5c907 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 6947dfad6..6947dfad6 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 c3ca52731..c3ca52731 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 bfdfd8830..bfdfd8830 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 9865b07b9..9865b07b9 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 fc22d2bb5..fc22d2bb5 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 35f9d7388..35f9d7388 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 9ced52953..9ced52953 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 8e1c1856d..8e1c1856d 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 8889183bd..8889183bd 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 ef34b8220..ef34b8220 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 37d355b52..37d355b52 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 e6e3ecf95..e6e3ecf95 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 bffb80bde..bffb80bde 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/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 05c53fb5e..05c53fb5e 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/kdm-theme-no-userlist/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/Dialog.png
index 801c4882a..801c4882a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/GdmGreeterTheme.desktop
index d1507f55f..d1507f55f 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/kubuntu.xml b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/kubuntu.xml
index 03b3a5e29..03b3a5e29 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme-no-userlist/system_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/Dialog.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/Dialog.png
index 4ad6c8ab4..4ad6c8ab4 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/Dialog.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/Dialog.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/GdmGreeterTheme.desktop b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/GdmGreeterTheme.desktop
index dcbca7a27..dcbca7a27 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/GdmGreeterTheme.desktop
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/GdmGreeterTheme.desktop
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_normal.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_over.png
index f1252a55a..f1252a55a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_pressed.png
index c859ce5df..c859ce5df 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/enter_pressed.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/gpl.txt b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/gpl.txt
index b6f92f3db..b6f92f3db 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/gpl.txt
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/gpl.txt
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/kubuntu.xml b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/kubuntu.xml
index 00caadbbb..00caadbbb 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/kubuntu.xml
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/kubuntu.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/preview.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/preview.png
index 5595d036e..5595d036e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/preview.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/preview.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_normal.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_normal.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_normal.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_normal.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_over.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_over.png
index 7d535efc8..7d535efc8 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_over.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_over.png
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_pressed.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_pressed.png
index ea9b1bdfa..ea9b1bdfa 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_pressed.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/kdm-theme/system_pressed.png
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 100755
--- 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/throbber/16x16/kde.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kde.png
index 5f4f1a9fb..5f4f1a9fb 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kde.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/22x22/kde.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kde.png
index e6f1e0bf6..e6f1e0bf6 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kde.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/32x32/kde.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kde.png
index f763d6bbb..f763d6bbb 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kde.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/48x48/kde.png b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kde.png
index d441f58bf..d441f58bf 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kde.png
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kde.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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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/gear.3ds b/ubuntu/_base/defaultsettings/redmond-default-settings/artwork/throbber/gear.3ds
index a9eab0fba..a9eab0fba 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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 687a079c4..687a079c4 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 5f2fdfa67..5f2fdfa67 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 0fdfbf2aa..0fdfbf2aa 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/redmond-default-settings-trinity.postinst b/ubuntu/_base/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst
index fc0689446..fc0689446 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 3727a65c1..3727a65c1 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 ec63a6444..ec63a6444 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 89ae9db8f..89ae9db8f 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/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 aae3f8a04..aae3f8a04 100755
--- 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 874f83934..874f83934 100755
--- 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/hal/20-ntfs-config-write-policy.fdi b/ubuntu/_base/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/_base/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
index 2dead0109..2dead0109 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/hal/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 100755
--- 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 100755
--- 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 100755
--- 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 100755
--- 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-profile/kde-user-profile b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-profile/kde-user-profile
index 647a34e46..647a34e46 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kde-user-profile
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-profile/kde-user-profile
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kde4rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-profile/kde4rc
index 454fa83f3..454fa83f3 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kde4rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-profile/kde4rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kderc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-profile/kderc
index df5ec9dc6..df5ec9dc6 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kderc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-profile/kderc
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 3995909f1..3995909f1 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 7259a697e..7259a697e 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 10fd37bab..10fd37bab 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 54d5dc921..54d5dc921 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 32c9da8fd..32c9da8fd 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/khtmlrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/khtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/khtmlrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/khtmlrc
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 33f11d197..33f11d197 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/kio_httprc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kio_httprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/klaunchrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/klaunchrc
index 1ca985896..1ca985896 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/klaunchrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/klaunchrc
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 e8f5cac9c..e8f5cac9c 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 100755
--- 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/kwalletrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kwalletrc
index 326194cb6..326194cb6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwalletrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kwalletrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwincrystalrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kwincrystalrc
index 3368a104a..3368a104a 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwincrystalrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kwincrystalrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwinrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kwinrc
index 2a5ba0c4c..2a5ba0c4c 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kwinrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde-rc-files/kwinrc
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 45e8ef43f..45e8ef43f 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 0cba16e75..0cba16e75 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 8f6b40439..8f6b40439 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/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 a7b4e4167..a7b4e4167 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 897bed37a..897bed37a 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/khtmlrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/khtmlrc
index 6a64b58be..6a64b58be 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/khtmlrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/khtmlrc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kio_httprc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kio_httprc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kio_httprc
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/kwalletrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwalletrc
index 326194cb6..326194cb6 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwalletrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kwalletrc
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/kdmdistrc b/ubuntu/_base/defaultsettings/redmond-default-settings/kdmdistrc
index da429992e..da429992e 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kdmdistrc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kdmdistrc
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/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 100755
--- 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 da8f97f73..da8f97f73 100755
--- 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 888d12e8d..888d12e8d 100755
--- 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 100755
--- 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/khtml_browser.rc b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/khtml_browser.rc
index 2eab2a321..2eab2a321 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kpart-rc-files/khtml_browser.rc
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kpart-rc-files/khtml_browser.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 100755
--- 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/kwallet-default-wallet/kdewallet.kwl b/ubuntu/_base/defaultsettings/redmond-default-settings/kwallet-default-wallet/kdewallet.kwl
index 485b2e683..485b2e683 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kwallet-default-wallet/kdewallet.kwl
+++ b/ubuntu/_base/defaultsettings/redmond-default-settings/kwallet-default-wallet/kdewallet.kwl
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 b8a1f6a57..b8a1f6a57 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 55a07116b..55a07116b 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 2a65951e3..2a65951e3 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 4fe4ad21d..4fe4ad21d 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 9833cee92..9833cee92 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 a9d55c0c5..a9d55c0c5 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 76ff0d62a..76ff0d62a 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 e9ab5c907..e9ab5c907 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 6947dfad6..6947dfad6 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 c3ca52731..c3ca52731 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 bfdfd8830..bfdfd8830 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 9865b07b9..9865b07b9 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 fc22d2bb5..fc22d2bb5 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 35f9d7388..35f9d7388 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 9ced52953..9ced52953 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 8e1c1856d..8e1c1856d 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 8889183bd..8889183bd 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 ef34b8220..ef34b8220 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 37d355b52..37d355b52 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 e6e3ecf95..e6e3ecf95 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 bffb80bde..bffb80bde 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/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 75c9add4b..75c9add4b 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 acfad87ba..acfad87ba 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 08101e0bb..08101e0bb 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 2e7e5c14f..2e7e5c14f 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 178ad58a4..178ad58a4 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 4929325df..4929325df 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 c61b31b55..c61b31b55 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 2369bdcef..2369bdcef 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 a7e1913b5..a7e1913b5 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/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/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 8d00b1ad6..8d00b1ad6 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 adf3b03f3..adf3b03f3 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.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 27fc1426c..27fc1426c 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 1708af1a2..1708af1a2 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 997a47b23..997a47b23 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 065115120..065115120 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 86f7e5798..86f7e5798 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 d0b39269e..d0b39269e 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 cf3ea25fb..cf3ea25fb 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/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/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/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/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 9859f3bbd..9859f3bbd 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 fc1624cb1..fc1624cb1 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 cd06159b1..cd06159b1 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 7f0eea47b..7f0eea47b 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/kde-i18n/debian/changelog b/ubuntu/_base/kde-i18n/debian/changelog
index 290010b6e..290010b6e 100644
--- a/ubuntu/maverick/kde-i18n/debian/changelog
+++ b/ubuntu/_base/kde-i18n/debian/changelog
diff --git a/ubuntu/maverick/kde-i18n/debian/compat b/ubuntu/_base/kde-i18n/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kde-i18n/debian/compat
+++ b/ubuntu/_base/kde-i18n/debian/compat
diff --git a/ubuntu/maverick/kde-i18n/debian/control b/ubuntu/_base/kde-i18n/debian/control
index c85763706..c85763706 100644
--- a/ubuntu/maverick/kde-i18n/debian/control
+++ b/ubuntu/_base/kde-i18n/debian/control
diff --git a/ubuntu/maverick/kde-i18n/debian/copyright b/ubuntu/_base/kde-i18n/debian/copyright
index aac858d55..aac858d55 100644
--- a/ubuntu/maverick/kde-i18n/debian/copyright
+++ b/ubuntu/_base/kde-i18n/debian/copyright
diff --git a/ubuntu/maverick/kde-i18n/debian/debiandirs b/ubuntu/_base/kde-i18n/debian/debiandirs
index be68a9592..be68a9592 100644
--- a/ubuntu/maverick/kde-i18n/debian/debiandirs
+++ b/ubuntu/_base/kde-i18n/debian/debiandirs
diff --git a/ubuntu/maverick/kde-i18n/debian/rules b/ubuntu/_base/kde-i18n/debian/rules
index f821e5339..f821e5339 100755
--- a/ubuntu/maverick/kde-i18n/debian/rules
+++ b/ubuntu/_base/kde-i18n/debian/rules
diff --git a/ubuntu/maverick/kde-i18n/debian/source/format b/ubuntu/_base/kde-i18n/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kde-i18n/debian/source/format
+++ b/ubuntu/_base/kde-i18n/debian/source/format
diff --git a/ubuntu/maverick/kde-i18n/debian/source/options b/ubuntu/_base/kde-i18n/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kde-i18n/debian/source/options
+++ b/ubuntu/_base/kde-i18n/debian/source/options
diff --git a/ubuntu/maverick/kdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES
index fe338c20b..fe338c20b 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdeaccessibility/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdeaccessibility/debian/cdbs/kde.mk b/ubuntu/_base/kdeaccessibility/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdeaccessibility/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdeaccessibility/debian/cdbs/versions.pl b/ubuntu/_base/kdeaccessibility/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdeaccessibility/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdeaccessibility/debian/changelog b/ubuntu/_base/kdeaccessibility/debian/changelog
index a41ed7638..a41ed7638 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/changelog
+++ b/ubuntu/_base/kdeaccessibility/debian/changelog
diff --git a/ubuntu/maverick/kdeaccessibility/debian/compat b/ubuntu/_base/kdeaccessibility/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/compat
+++ b/ubuntu/_base/kdeaccessibility/debian/compat
diff --git a/ubuntu/maverick/kdeaccessibility/debian/control b/ubuntu/_base/kdeaccessibility/debian/control
index 84dffaff4..84dffaff4 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/control
+++ b/ubuntu/_base/kdeaccessibility/debian/control
diff --git a/ubuntu/maverick/kdeaccessibility/debian/copyright b/ubuntu/_base/kdeaccessibility/debian/copyright
index a5ae39688..a5ae39688 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/copyright
+++ b/ubuntu/_base/kdeaccessibility/debian/copyright
diff --git a/ubuntu/maverick/kdeaccessibility/debian/icons/kmag-16.xpm b/ubuntu/_base/kdeaccessibility/debian/icons/kmag-16.xpm
index 4fd4e826a..4fd4e826a 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/icons/kmag-16.xpm
+++ b/ubuntu/_base/kdeaccessibility/debian/icons/kmag-16.xpm
diff --git a/ubuntu/maverick/kdeaccessibility/debian/icons/kmag.xpm b/ubuntu/_base/kdeaccessibility/debian/icons/kmag.xpm
index 5f7bcea45..5f7bcea45 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/icons/kmag.xpm
+++ b/ubuntu/_base/kdeaccessibility/debian/icons/kmag.xpm
diff --git a/ubuntu/maverick/kdeaccessibility/debian/icons/kmousetool-16.xpm b/ubuntu/_base/kdeaccessibility/debian/icons/kmousetool-16.xpm
index 74a11e135..74a11e135 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/icons/kmousetool-16.xpm
+++ b/ubuntu/_base/kdeaccessibility/debian/icons/kmousetool-16.xpm
diff --git a/ubuntu/maverick/kdeaccessibility/debian/icons/kmousetool.xpm b/ubuntu/_base/kdeaccessibility/debian/icons/kmousetool.xpm
index 0a25d71f1..0a25d71f1 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/icons/kmousetool.xpm
+++ b/ubuntu/_base/kdeaccessibility/debian/icons/kmousetool.xpm
diff --git a/ubuntu/maverick/kdeaccessibility/debian/icons/kmouth-16.xpm b/ubuntu/_base/kdeaccessibility/debian/icons/kmouth-16.xpm
index dc538ae44..dc538ae44 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/icons/kmouth-16.xpm
+++ b/ubuntu/_base/kdeaccessibility/debian/icons/kmouth-16.xpm
diff --git a/ubuntu/maverick/kdeaccessibility/debian/icons/kmouth.xpm b/ubuntu/_base/kdeaccessibility/debian/icons/kmouth.xpm
index b0b027449..b0b027449 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/icons/kmouth.xpm
+++ b/ubuntu/_base/kdeaccessibility/debian/icons/kmouth.xpm
diff --git a/ubuntu/maverick/kdeaccessibility/debian/icons/ksayit-16.xpm b/ubuntu/_base/kdeaccessibility/debian/icons/ksayit-16.xpm
index 3f4ed6de3..3f4ed6de3 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/icons/ksayit-16.xpm
+++ b/ubuntu/_base/kdeaccessibility/debian/icons/ksayit-16.xpm
diff --git a/ubuntu/maverick/kdeaccessibility/debian/icons/ksayit.xpm b/ubuntu/_base/kdeaccessibility/debian/icons/ksayit.xpm
index a89efc70f..a89efc70f 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/icons/ksayit.xpm
+++ b/ubuntu/_base/kdeaccessibility/debian/icons/ksayit.xpm
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kbstate-trinity.install b/ubuntu/_base/kdeaccessibility/debian/kbstate-trinity.install
index a5c05d80c..a5c05d80c 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kbstate-trinity.install
+++ b/ubuntu/_base/kdeaccessibility/debian/kbstate-trinity.install
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kde-icons-mono-trinity.install b/ubuntu/_base/kdeaccessibility/debian/kde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kde-icons-mono-trinity.install
+++ b/ubuntu/_base/kdeaccessibility/debian/kde-icons-mono-trinity.install
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag b/ubuntu/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag
index 73ad856ab..73ad856ab 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag
+++ b/ubuntu/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmag
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool b/ubuntu/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool
index 50912a620..50912a620 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool
+++ b/ubuntu/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmousetool
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth b/ubuntu/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth
index c51acf449..c51acf449 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth
+++ b/ubuntu/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kmouth
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd b/ubuntu/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd
index e296ff7b8..e296ff7b8 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd
+++ b/ubuntu/_base/kdeaccessibility/debian/kdeaccessibility-doc-html.doc-base.kttsd
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kmag-trinity.install b/ubuntu/_base/kdeaccessibility/debian/kmag-trinity.install
index 246740b9c..246740b9c 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kmag-trinity.install
+++ b/ubuntu/_base/kdeaccessibility/debian/kmag-trinity.install
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kmag-trinity.manpages b/ubuntu/_base/kdeaccessibility/debian/kmag-trinity.manpages
index 6579ddb0f..6579ddb0f 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kmag-trinity.manpages
+++ b/ubuntu/_base/kdeaccessibility/debian/kmag-trinity.manpages
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kmag-trinity.menu b/ubuntu/_base/kdeaccessibility/debian/kmag-trinity.menu
index e65ffb1d6..e65ffb1d6 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kmag-trinity.menu
+++ b/ubuntu/_base/kdeaccessibility/debian/kmag-trinity.menu
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kmousetool-trinity.install b/ubuntu/_base/kdeaccessibility/debian/kmousetool-trinity.install
index 51eb07e7e..51eb07e7e 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kmousetool-trinity.install
+++ b/ubuntu/_base/kdeaccessibility/debian/kmousetool-trinity.install
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kmousetool-trinity.manpages b/ubuntu/_base/kdeaccessibility/debian/kmousetool-trinity.manpages
index 4ebe07483..4ebe07483 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kmousetool-trinity.manpages
+++ b/ubuntu/_base/kdeaccessibility/debian/kmousetool-trinity.manpages
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kmousetool-trinity.menu b/ubuntu/_base/kdeaccessibility/debian/kmousetool-trinity.menu
index 1925a2979..1925a2979 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kmousetool-trinity.menu
+++ b/ubuntu/_base/kdeaccessibility/debian/kmousetool-trinity.menu
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kmouth-trinity.install b/ubuntu/_base/kdeaccessibility/debian/kmouth-trinity.install
index b9eed5500..b9eed5500 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kmouth-trinity.install
+++ b/ubuntu/_base/kdeaccessibility/debian/kmouth-trinity.install
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kmouth-trinity.manpages b/ubuntu/_base/kdeaccessibility/debian/kmouth-trinity.manpages
index b459b0888..b459b0888 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kmouth-trinity.manpages
+++ b/ubuntu/_base/kdeaccessibility/debian/kmouth-trinity.manpages
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kmouth-trinity.menu b/ubuntu/_base/kdeaccessibility/debian/kmouth-trinity.menu
index 249e7792e..249e7792e 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kmouth-trinity.menu
+++ b/ubuntu/_base/kdeaccessibility/debian/kmouth-trinity.menu
diff --git a/ubuntu/maverick/kdeaccessibility/debian/ksayit-trinity.install b/ubuntu/_base/kdeaccessibility/debian/ksayit-trinity.install
index 2f5be2460..2f5be2460 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/ksayit-trinity.install
+++ b/ubuntu/_base/kdeaccessibility/debian/ksayit-trinity.install
diff --git a/ubuntu/maverick/kdeaccessibility/debian/ksayit-trinity.menu b/ubuntu/_base/kdeaccessibility/debian/ksayit-trinity.menu
index a88a21ebc..a88a21ebc 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/ksayit-trinity.menu
+++ b/ubuntu/_base/kdeaccessibility/debian/ksayit-trinity.menu
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install b/ubuntu/_base/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
index 698f85fe2..698f85fe2 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
+++ b/ubuntu/_base/kdeaccessibility/debian/kttsd-contrib-plugins-trinity.install
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kttsd-trinity.install b/ubuntu/_base/kdeaccessibility/debian/kttsd-trinity.install
index 550a4fa02..550a4fa02 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kttsd-trinity.install
+++ b/ubuntu/_base/kdeaccessibility/debian/kttsd-trinity.install
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64 b/ubuntu/_base/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
index ad08c3f72..ad08c3f72 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
+++ b/ubuntu/_base/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-amd64
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386 b/ubuntu/_base/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
index ad08c3f72..ad08c3f72 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
+++ b/ubuntu/_base/kdeaccessibility/debian/kttsd-trinity.install.kfreebsd-i386
diff --git a/ubuntu/maverick/kdeaccessibility/debian/kttsd.README.Debian b/ubuntu/_base/kdeaccessibility/debian/kttsd.README.Debian
index e2c0cf91f..e2c0cf91f 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/kttsd.README.Debian
+++ b/ubuntu/_base/kdeaccessibility/debian/kttsd.README.Debian
diff --git a/ubuntu/maverick/kdeaccessibility/debian/man/kdeopt-trinity.part b/ubuntu/_base/kdeaccessibility/debian/man/kdeopt-trinity.part
index 9ab90ed9c..9ab90ed9c 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/man/kdeopt-trinity.part
+++ b/ubuntu/_base/kdeaccessibility/debian/man/kdeopt-trinity.part
diff --git a/ubuntu/maverick/kdeaccessibility/debian/man/kmag-trinity.man b/ubuntu/_base/kdeaccessibility/debian/man/kmag-trinity.man
index c05ffb6ce..c05ffb6ce 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/man/kmag-trinity.man
+++ b/ubuntu/_base/kdeaccessibility/debian/man/kmag-trinity.man
diff --git a/ubuntu/maverick/kdeaccessibility/debian/man/kmousetool-trinity.man b/ubuntu/_base/kdeaccessibility/debian/man/kmousetool-trinity.man
index 1b077f746..1b077f746 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/man/kmousetool-trinity.man
+++ b/ubuntu/_base/kdeaccessibility/debian/man/kmousetool-trinity.man
diff --git a/ubuntu/maverick/kdeaccessibility/debian/man/kmouth-trinity.man b/ubuntu/_base/kdeaccessibility/debian/man/kmouth-trinity.man
index e0f9ee485..e0f9ee485 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/man/kmouth-trinity.man
+++ b/ubuntu/_base/kdeaccessibility/debian/man/kmouth-trinity.man
diff --git a/ubuntu/maverick/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdeaccessibility/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdeaccessibility/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdeaccessibility/debian/patches/series b/ubuntu/_base/kdeaccessibility/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/patches/series
+++ b/ubuntu/_base/kdeaccessibility/debian/patches/series
diff --git a/ubuntu/maverick/kdeaccessibility/debian/rules b/ubuntu/_base/kdeaccessibility/debian/rules
index 40438cdd6..40438cdd6 100755
--- a/ubuntu/maverick/kdeaccessibility/debian/rules
+++ b/ubuntu/_base/kdeaccessibility/debian/rules
diff --git a/ubuntu/maverick/kdeaccessibility/debian/source/format b/ubuntu/_base/kdeaccessibility/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/source/format
+++ b/ubuntu/_base/kdeaccessibility/debian/source/format
diff --git a/ubuntu/maverick/kdeaccessibility/debian/source/options b/ubuntu/_base/kdeaccessibility/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/source/options
+++ b/ubuntu/_base/kdeaccessibility/debian/source/options
diff --git a/ubuntu/maverick/kdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
index da64a9233..da64a9233 100644
--- a/ubuntu/maverick/kdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdeaddons/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdeaddons/debian/atlantikdesigner-trinity.docs b/ubuntu/_base/kdeaddons/debian/atlantikdesigner-trinity.docs
index c83224ab3..c83224ab3 100644
--- a/ubuntu/maverick/kdeaddons/debian/atlantikdesigner-trinity.docs
+++ b/ubuntu/_base/kdeaddons/debian/atlantikdesigner-trinity.docs
diff --git a/ubuntu/maverick/kdeaddons/debian/atlantikdesigner-trinity.install b/ubuntu/_base/kdeaddons/debian/atlantikdesigner-trinity.install
index 825b20fde..825b20fde 100644
--- a/ubuntu/maverick/kdeaddons/debian/atlantikdesigner-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/atlantikdesigner-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/atlantikdesigner-trinity.manpages b/ubuntu/_base/kdeaddons/debian/atlantikdesigner-trinity.manpages
index f0b5385f4..f0b5385f4 100644
--- a/ubuntu/maverick/kdeaddons/debian/atlantikdesigner-trinity.manpages
+++ b/ubuntu/_base/kdeaddons/debian/atlantikdesigner-trinity.manpages
diff --git a/ubuntu/maverick/kdeaddons/debian/atlantikdesigner-trinity.menu b/ubuntu/_base/kdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..3f5845f50 100644
--- a/ubuntu/maverick/kdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/ubuntu/_base/kdeaddons/debian/atlantikdesigner-trinity.menu
diff --git a/ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdeaddons/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdeaddons/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdeaddons/debian/cdbs/kde.mk b/ubuntu/_base/kdeaddons/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdeaddons/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdeaddons/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdeaddons/debian/cdbs/versions.pl b/ubuntu/_base/kdeaddons/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdeaddons/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdeaddons/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdeaddons/debian/changelog b/ubuntu/_base/kdeaddons/debian/changelog
index 73bd4d9e5..73bd4d9e5 100644
--- a/ubuntu/maverick/kdeaddons/debian/changelog
+++ b/ubuntu/_base/kdeaddons/debian/changelog
diff --git a/ubuntu/maverick/kdeaddons/debian/compat b/ubuntu/_base/kdeaddons/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdeaddons/debian/compat
+++ b/ubuntu/_base/kdeaddons/debian/compat
diff --git a/ubuntu/maverick/kdeaddons/debian/control b/ubuntu/_base/kdeaddons/debian/control
index 8d6cc6db5..8d6cc6db5 100644
--- a/ubuntu/maverick/kdeaddons/debian/control
+++ b/ubuntu/_base/kdeaddons/debian/control
diff --git a/ubuntu/maverick/kdeaddons/debian/copyright b/ubuntu/_base/kdeaddons/debian/copyright
index f954fd3dc..f954fd3dc 100644
--- a/ubuntu/maverick/kdeaddons/debian/copyright
+++ b/ubuntu/_base/kdeaddons/debian/copyright
diff --git a/ubuntu/maverick/kdeaddons/debian/icons/atlantikdesigner.xpm b/ubuntu/_base/kdeaddons/debian/icons/atlantikdesigner.xpm
index 6375271fe..6375271fe 100644
--- a/ubuntu/maverick/kdeaddons/debian/icons/atlantikdesigner.xpm
+++ b/ubuntu/_base/kdeaddons/debian/icons/atlantikdesigner.xpm
diff --git a/ubuntu/maverick/kdeaddons/debian/icons/fsview.xpm b/ubuntu/_base/kdeaddons/debian/icons/fsview.xpm
index b50ac952c..b50ac952c 100644
--- a/ubuntu/maverick/kdeaddons/debian/icons/fsview.xpm
+++ b/ubuntu/_base/kdeaddons/debian/icons/fsview.xpm
diff --git a/ubuntu/maverick/kdeaddons/debian/icons/ksig.xpm b/ubuntu/_base/kdeaddons/debian/icons/ksig.xpm
index 805e027d1..805e027d1 100644
--- a/ubuntu/maverick/kdeaddons/debian/icons/ksig.xpm
+++ b/ubuntu/_base/kdeaddons/debian/icons/ksig.xpm
diff --git a/ubuntu/maverick/kdeaddons/debian/kaddressbook-plugins-trinity.install b/ubuntu/_base/kdeaddons/debian/kaddressbook-plugins-trinity.install
index a2102d3a8..a2102d3a8 100644
--- a/ubuntu/maverick/kdeaddons/debian/kaddressbook-plugins-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/kaddressbook-plugins-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.README.Debian b/ubuntu/_base/kdeaddons/debian/kate-plugins-trinity.README.Debian
index 933d86cd0..933d86cd0 100644
--- a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.README.Debian
+++ b/ubuntu/_base/kdeaddons/debian/kate-plugins-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.docs b/ubuntu/_base/kdeaddons/debian/kate-plugins-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.docs
+++ b/ubuntu/_base/kdeaddons/debian/kate-plugins-trinity.docs
diff --git a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.install b/ubuntu/_base/kdeaddons/debian/kate-plugins-trinity.install
index 06e96f20f..06e96f20f 100644
--- a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/kate-plugins-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.lintian b/ubuntu/_base/kdeaddons/debian/kate-plugins-trinity.lintian
index 27eca0292..27eca0292 100644
--- a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.lintian
+++ b/ubuntu/_base/kdeaddons/debian/kate-plugins-trinity.lintian
diff --git a/ubuntu/maverick/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins b/ubuntu/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
index 7eaee07d9..7eaee07d9 100644
--- a/ubuntu/maverick/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
+++ b/ubuntu/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.kate-plugins
diff --git a/ubuntu/maverick/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets b/ubuntu/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
index 863894246..863894246 100644
--- a/ubuntu/maverick/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
+++ b/ubuntu/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.kicker-applets
diff --git a/ubuntu/maverick/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins b/ubuntu/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
index 4e89e7f68..4e89e7f68 100644
--- a/ubuntu/maverick/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
+++ b/ubuntu/_base/kdeaddons/debian/kdeaddons-doc-html.doc-base.konq-plugins
diff --git a/ubuntu/maverick/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install b/ubuntu/_base/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
index a85a16b55..a85a16b55 100644
--- a/ubuntu/maverick/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages b/ubuntu/_base/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages
index eda9949fb..eda9949fb 100644
--- a/ubuntu/maverick/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages
+++ b/ubuntu/_base/kdeaddons/debian/kdeaddons-kfile-plugins-trinity.manpages
diff --git a/ubuntu/maverick/kdeaddons/debian/kdeaddons-trinity.README.Debian b/ubuntu/_base/kdeaddons/debian/kdeaddons-trinity.README.Debian
index 0daab22b0..0daab22b0 100644
--- a/ubuntu/maverick/kdeaddons/debian/kdeaddons-trinity.README.Debian
+++ b/ubuntu/_base/kdeaddons/debian/kdeaddons-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.README.Debian b/ubuntu/_base/kdeaddons/debian/kicker-applets-trinity.README.Debian
index 881d7b395..881d7b395 100644
--- a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.README.Debian
+++ b/ubuntu/_base/kdeaddons/debian/kicker-applets-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.docs b/ubuntu/_base/kdeaddons/debian/kicker-applets-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.docs
+++ b/ubuntu/_base/kdeaddons/debian/kicker-applets-trinity.docs
diff --git a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install b/ubuntu/_base/kdeaddons/debian/kicker-applets-trinity.install
index 3ffd7717e..3ffd7717e 100644
--- a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/kicker-applets-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/_base/kdeaddons/debian/kicker-applets-trinity.lintian
index 705d74139..705d74139 100644
--- a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.lintian
+++ b/ubuntu/_base/kdeaddons/debian/kicker-applets-trinity.lintian
diff --git a/ubuntu/maverick/kdeaddons/debian/knewsticker-scripts-trinity.README.Debian b/ubuntu/_base/kdeaddons/debian/knewsticker-scripts-trinity.README.Debian
index c6986aa86..c6986aa86 100644
--- a/ubuntu/maverick/kdeaddons/debian/knewsticker-scripts-trinity.README.Debian
+++ b/ubuntu/_base/kdeaddons/debian/knewsticker-scripts-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeaddons/debian/knewsticker-scripts-trinity.docs b/ubuntu/_base/kdeaddons/debian/knewsticker-scripts-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/kdeaddons/debian/knewsticker-scripts-trinity.docs
+++ b/ubuntu/_base/kdeaddons/debian/knewsticker-scripts-trinity.docs
diff --git a/ubuntu/maverick/kdeaddons/debian/knewsticker-scripts-trinity.install b/ubuntu/_base/kdeaddons/debian/knewsticker-scripts-trinity.install
index ce04dabc0..ce04dabc0 100644
--- a/ubuntu/maverick/kdeaddons/debian/knewsticker-scripts-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/knewsticker-scripts-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/knewsticker-scripts-trinity.links b/ubuntu/_base/kdeaddons/debian/knewsticker-scripts-trinity.links
index d7b05a420..d7b05a420 100644
--- a/ubuntu/maverick/kdeaddons/debian/knewsticker-scripts-trinity.links
+++ b/ubuntu/_base/kdeaddons/debian/knewsticker-scripts-trinity.links
diff --git a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.README.Debian b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.README.Debian
index 75c1d8461..75c1d8461 100644
--- a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.README.Debian
+++ b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.docs b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.docs
index 2cddc21a6..2cddc21a6 100644
--- a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.docs
+++ b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.docs
diff --git a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.install b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.install
index c74edf4ce..c74edf4ce 100644
--- a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.manpages b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.manpages
index b33b9ee5a..b33b9ee5a 100644
--- a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.manpages
+++ b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.manpages
diff --git a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.menu b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.menu
index 0a87e945c..0a87e945c 100644
--- a/ubuntu/maverick/kdeaddons/debian/konq-plugins-trinity.menu
+++ b/ubuntu/_base/kdeaddons/debian/konq-plugins-trinity.menu
diff --git a/ubuntu/maverick/kdeaddons/debian/kontact-plugins-trinity.install b/ubuntu/_base/kdeaddons/debian/kontact-plugins-trinity.install
index 3571c1d1d..3571c1d1d 100644
--- a/ubuntu/maverick/kdeaddons/debian/kontact-plugins-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/kontact-plugins-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/ksig-trinity.README.Debian b/ubuntu/_base/kdeaddons/debian/ksig-trinity.README.Debian
index 0d97c94db..0d97c94db 100644
--- a/ubuntu/maverick/kdeaddons/debian/ksig-trinity.README.Debian
+++ b/ubuntu/_base/kdeaddons/debian/ksig-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeaddons/debian/ksig-trinity.install b/ubuntu/_base/kdeaddons/debian/ksig-trinity.install
index 9f0d70be0..9f0d70be0 100644
--- a/ubuntu/maverick/kdeaddons/debian/ksig-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/ksig-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/ksig-trinity.manpages b/ubuntu/_base/kdeaddons/debian/ksig-trinity.manpages
index 2b3ef735d..2b3ef735d 100644
--- a/ubuntu/maverick/kdeaddons/debian/ksig-trinity.manpages
+++ b/ubuntu/_base/kdeaddons/debian/ksig-trinity.manpages
diff --git a/ubuntu/maverick/kdeaddons/debian/ksig-trinity.menu b/ubuntu/_base/kdeaddons/debian/ksig-trinity.menu
index 1b9cf2f16..1b9cf2f16 100644
--- a/ubuntu/maverick/kdeaddons/debian/ksig-trinity.menu
+++ b/ubuntu/_base/kdeaddons/debian/ksig-trinity.menu
diff --git a/ubuntu/maverick/kdeaddons/debian/man/atlantikdesigner-trinity.1 b/ubuntu/_base/kdeaddons/debian/man/atlantikdesigner-trinity.1
index c345fcf5b..c345fcf5b 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/atlantikdesigner-trinity.1
+++ b/ubuntu/_base/kdeaddons/debian/man/atlantikdesigner-trinity.1
diff --git a/ubuntu/maverick/kdeaddons/debian/man/exif-trinity.py.1 b/ubuntu/_base/kdeaddons/debian/man/exif-trinity.py.1
index c71467605..c71467605 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/exif-trinity.py.1
+++ b/ubuntu/_base/kdeaddons/debian/man/exif-trinity.py.1
diff --git a/ubuntu/maverick/kdeaddons/debian/man/fsview-trinity.1 b/ubuntu/_base/kdeaddons/debian/man/fsview-trinity.1
index cbc9afc03..cbc9afc03 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/fsview-trinity.1
+++ b/ubuntu/_base/kdeaddons/debian/man/fsview-trinity.1
diff --git a/ubuntu/maverick/kdeaddons/debian/man/jpegorient-trinity.1 b/ubuntu/_base/kdeaddons/debian/man/jpegorient-trinity.1
index 0b01d63f6..0b01d63f6 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/jpegorient-trinity.1
+++ b/ubuntu/_base/kdeaddons/debian/man/jpegorient-trinity.1
diff --git a/ubuntu/maverick/kdeaddons/debian/man/ksig-trinity.1 b/ubuntu/_base/kdeaddons/debian/man/ksig-trinity.1
index d88a9907b..d88a9907b 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/ksig-trinity.1
+++ b/ubuntu/_base/kdeaddons/debian/man/ksig-trinity.1
diff --git a/ubuntu/maverick/kdeaddons/debian/man/lnkforward-trinity.1 b/ubuntu/_base/kdeaddons/debian/man/lnkforward-trinity.1
index ea3010dd8..ea3010dd8 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/lnkforward-trinity.1
+++ b/ubuntu/_base/kdeaddons/debian/man/lnkforward-trinity.1
diff --git a/ubuntu/maverick/kdeaddons/debian/man/noatunsynaescope-trinity.bin.1 b/ubuntu/_base/kdeaddons/debian/man/noatunsynaescope-trinity.bin.1
index 14d164ea1..14d164ea1 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/noatunsynaescope-trinity.bin.1
+++ b/ubuntu/_base/kdeaddons/debian/man/noatunsynaescope-trinity.bin.1
diff --git a/ubuntu/maverick/kdeaddons/debian/man/noatuntippecanoe-trinity.bin.1 b/ubuntu/_base/kdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
index 7e128d0e1..7e128d0e1 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
+++ b/ubuntu/_base/kdeaddons/debian/man/noatuntippecanoe-trinity.bin.1
diff --git a/ubuntu/maverick/kdeaddons/debian/man/noatuntyler-trinity.bin.1 b/ubuntu/_base/kdeaddons/debian/man/noatuntyler-trinity.bin.1
index 4fd35e452..4fd35e452 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/noatuntyler-trinity.bin.1
+++ b/ubuntu/_base/kdeaddons/debian/man/noatuntyler-trinity.bin.1
diff --git a/ubuntu/maverick/kdeaddons/debian/man/orient-trinity.py.1 b/ubuntu/_base/kdeaddons/debian/man/orient-trinity.py.1
index cbdeab853..cbdeab853 100644
--- a/ubuntu/maverick/kdeaddons/debian/man/orient-trinity.py.1
+++ b/ubuntu/_base/kdeaddons/debian/man/orient-trinity.py.1
diff --git a/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.docs b/ubuntu/_base/kdeaddons/debian/noatun-plugins-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.docs
+++ b/ubuntu/_base/kdeaddons/debian/noatun-plugins-trinity.docs
diff --git a/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.install b/ubuntu/_base/kdeaddons/debian/noatun-plugins-trinity.install
index 843bdf15c..843bdf15c 100644
--- a/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.install
+++ b/ubuntu/_base/kdeaddons/debian/noatun-plugins-trinity.install
diff --git a/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.manpages b/ubuntu/_base/kdeaddons/debian/noatun-plugins-trinity.manpages
index 76a3fc35b..76a3fc35b 100644
--- a/ubuntu/maverick/kdeaddons/debian/noatun-plugins-trinity.manpages
+++ b/ubuntu/_base/kdeaddons/debian/noatun-plugins-trinity.manpages
diff --git a/ubuntu/maverick/kdeaddons/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdeaddons/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdeaddons/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdeaddons/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdeaddons/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdeaddons/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdeaddons/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdeaddons/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdeaddons/debian/patches/series b/ubuntu/_base/kdeaddons/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdeaddons/debian/patches/series
+++ b/ubuntu/_base/kdeaddons/debian/patches/series
diff --git a/ubuntu/maverick/kdeaddons/debian/rules b/ubuntu/_base/kdeaddons/debian/rules
index 7c1c683e5..7c1c683e5 100755
--- a/ubuntu/maverick/kdeaddons/debian/rules
+++ b/ubuntu/_base/kdeaddons/debian/rules
diff --git a/ubuntu/maverick/kdeaddons/debian/source.lintian-overrides b/ubuntu/_base/kdeaddons/debian/source.lintian-overrides
index 842c39ad3..842c39ad3 100644
--- a/ubuntu/maverick/kdeaddons/debian/source.lintian-overrides
+++ b/ubuntu/_base/kdeaddons/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/kdeaddons/debian/source/format b/ubuntu/_base/kdeaddons/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdeaddons/debian/source/format
+++ b/ubuntu/_base/kdeaddons/debian/source/format
diff --git a/ubuntu/maverick/kdeaddons/debian/source/options b/ubuntu/_base/kdeaddons/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdeaddons/debian/source/options
+++ b/ubuntu/_base/kdeaddons/debian/source/options
diff --git a/ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdeadmin/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdeadmin/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdeadmin/debian/cdbs/kde.mk b/ubuntu/_base/kdeadmin/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdeadmin/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdeadmin/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdeadmin/debian/cdbs/versions.pl b/ubuntu/_base/kdeadmin/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdeadmin/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdeadmin/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdeadmin/debian/changelog b/ubuntu/_base/kdeadmin/debian/changelog
index a8257c153..a8257c153 100644
--- a/ubuntu/maverick/kdeadmin/debian/changelog
+++ b/ubuntu/_base/kdeadmin/debian/changelog
diff --git a/ubuntu/maverick/kdeadmin/debian/compat b/ubuntu/_base/kdeadmin/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdeadmin/debian/compat
+++ b/ubuntu/_base/kdeadmin/debian/compat
diff --git a/ubuntu/maverick/kdeadmin/debian/control b/ubuntu/_base/kdeadmin/debian/control
index fb5cd50dc..fb5cd50dc 100644
--- a/ubuntu/maverick/kdeadmin/debian/control
+++ b/ubuntu/_base/kdeadmin/debian/control
diff --git a/ubuntu/maverick/kdeadmin/debian/copyright b/ubuntu/_base/kdeadmin/debian/copyright
index 7d7dfaf18..7d7dfaf18 100644
--- a/ubuntu/maverick/kdeadmin/debian/copyright
+++ b/ubuntu/_base/kdeadmin/debian/copyright
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/kcron-16.xpm b/ubuntu/_base/kdeadmin/debian/icons/kcron-16.xpm
index bfc8199a0..bfc8199a0 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/kcron-16.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/kcron-16.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/kcron.xpm b/ubuntu/_base/kdeadmin/debian/icons/kcron.xpm
index cbc8bef00..cbc8bef00 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/kcron.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/kcron.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/kdat-16.xpm b/ubuntu/_base/kdeadmin/debian/icons/kdat-16.xpm
index 03099b5f4..03099b5f4 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/kdat-16.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/kdat-16.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/kdat.xpm b/ubuntu/_base/kdeadmin/debian/icons/kdat.xpm
index af560d190..af560d190 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/kdat.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/kdat.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/kpackage-16.xpm b/ubuntu/_base/kdeadmin/debian/icons/kpackage-16.xpm
index 7e402e6fb..7e402e6fb 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/kpackage-16.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/kpackage-16.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/kpackage.xpm b/ubuntu/_base/kdeadmin/debian/icons/kpackage.xpm
index f18eb1f59..f18eb1f59 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/kpackage.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/kpackage.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/ksysv-16.xpm b/ubuntu/_base/kdeadmin/debian/icons/ksysv-16.xpm
index 3a50bc941..3a50bc941 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/ksysv-16.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/ksysv-16.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/ksysv.xpm b/ubuntu/_base/kdeadmin/debian/icons/ksysv.xpm
index ed55cf101..ed55cf101 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/ksysv.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/ksysv.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/kuser-16.xpm b/ubuntu/_base/kdeadmin/debian/icons/kuser-16.xpm
index 8bace5a27..8bace5a27 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/kuser-16.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/kuser-16.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/icons/kuser.xpm b/ubuntu/_base/kdeadmin/debian/icons/kuser.xpm
index bdb97c27b..bdb97c27b 100644
--- a/ubuntu/maverick/kdeadmin/debian/icons/kuser.xpm
+++ b/ubuntu/_base/kdeadmin/debian/icons/kuser.xpm
diff --git a/ubuntu/maverick/kdeadmin/debian/kcron-trinity.install b/ubuntu/_base/kdeadmin/debian/kcron-trinity.install
index 45ad26a61..45ad26a61 100644
--- a/ubuntu/maverick/kdeadmin/debian/kcron-trinity.install
+++ b/ubuntu/_base/kdeadmin/debian/kcron-trinity.install
diff --git a/ubuntu/maverick/kdeadmin/debian/kcron-trinity.manpages b/ubuntu/_base/kdeadmin/debian/kcron-trinity.manpages
index 069c663ae..069c663ae 100644
--- a/ubuntu/maverick/kdeadmin/debian/kcron-trinity.manpages
+++ b/ubuntu/_base/kdeadmin/debian/kcron-trinity.manpages
diff --git a/ubuntu/maverick/kdeadmin/debian/kcron-trinity.menu b/ubuntu/_base/kdeadmin/debian/kcron-trinity.menu
index 13b9c1279..13b9c1279 100644
--- a/ubuntu/maverick/kdeadmin/debian/kcron-trinity.menu
+++ b/ubuntu/_base/kdeadmin/debian/kcron-trinity.menu
diff --git a/ubuntu/maverick/kdeadmin/debian/kdat-trinity.install b/ubuntu/_base/kdeadmin/debian/kdat-trinity.install
index 2f7665f37..2f7665f37 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdat-trinity.install
+++ b/ubuntu/_base/kdeadmin/debian/kdat-trinity.install
diff --git a/ubuntu/maverick/kdeadmin/debian/kdat-trinity.manpages b/ubuntu/_base/kdeadmin/debian/kdat-trinity.manpages
index 593a2a25c..593a2a25c 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdat-trinity.manpages
+++ b/ubuntu/_base/kdeadmin/debian/kdat-trinity.manpages
diff --git a/ubuntu/maverick/kdeadmin/debian/kdat-trinity.menu b/ubuntu/_base/kdeadmin/debian/kdat-trinity.menu
index 549b237ad..549b237ad 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdat-trinity.menu
+++ b/ubuntu/_base/kdeadmin/debian/kdat-trinity.menu
diff --git a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
index 5ed27d366..5ed27d366 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
+++ b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kcron
diff --git a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
index b23a74fac..b23a74fac 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
+++ b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kdat
diff --git a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
index ace81a59c..ace81a59c 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
+++ b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.knetworkconf
diff --git a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
index 2291c2e04..2291c2e04 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
+++ b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kpackage
diff --git a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
index a367eb2b2..a367eb2b2 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
+++ b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.ksysv
diff --git a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
index 8b14ff285..8b14ff285 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
+++ b/ubuntu/_base/kdeadmin/debian/kdeadmin-doc-html.doc-base.kuser
diff --git a/ubuntu/maverick/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install b/ubuntu/_base/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
index e3b00f7da..e3b00f7da 100644
--- a/ubuntu/maverick/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
+++ b/ubuntu/_base/kdeadmin/debian/kdeadmin-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/kdeadmin/debian/knetworkconf-trinity.install b/ubuntu/_base/kdeadmin/debian/knetworkconf-trinity.install
index cd5b1d3b4..cd5b1d3b4 100644
--- a/ubuntu/maverick/kdeadmin/debian/knetworkconf-trinity.install
+++ b/ubuntu/_base/kdeadmin/debian/knetworkconf-trinity.install
diff --git a/ubuntu/maverick/kdeadmin/debian/knetworkconf-trinity.postinst b/ubuntu/_base/kdeadmin/debian/knetworkconf-trinity.postinst
index 94012bd76..94012bd76 100644
--- a/ubuntu/maverick/kdeadmin/debian/knetworkconf-trinity.postinst
+++ b/ubuntu/_base/kdeadmin/debian/knetworkconf-trinity.postinst
diff --git a/ubuntu/maverick/kdeadmin/debian/kpackage-trinity.install b/ubuntu/_base/kdeadmin/debian/kpackage-trinity.install
index 20c26fbe0..20c26fbe0 100644
--- a/ubuntu/maverick/kdeadmin/debian/kpackage-trinity.install
+++ b/ubuntu/_base/kdeadmin/debian/kpackage-trinity.install
diff --git a/ubuntu/maverick/kdeadmin/debian/kpackage-trinity.manpages b/ubuntu/_base/kdeadmin/debian/kpackage-trinity.manpages
index ef024d1b2..ef024d1b2 100644
--- a/ubuntu/maverick/kdeadmin/debian/kpackage-trinity.manpages
+++ b/ubuntu/_base/kdeadmin/debian/kpackage-trinity.manpages
diff --git a/ubuntu/maverick/kdeadmin/debian/kpackage-trinity.menu b/ubuntu/_base/kdeadmin/debian/kpackage-trinity.menu
index a22bc37d3..a22bc37d3 100644
--- a/ubuntu/maverick/kdeadmin/debian/kpackage-trinity.menu
+++ b/ubuntu/_base/kdeadmin/debian/kpackage-trinity.menu
diff --git a/ubuntu/maverick/kdeadmin/debian/kpackage-trinity.mime b/ubuntu/_base/kdeadmin/debian/kpackage-trinity.mime
index e416e75bd..e416e75bd 100644
--- a/ubuntu/maverick/kdeadmin/debian/kpackage-trinity.mime
+++ b/ubuntu/_base/kdeadmin/debian/kpackage-trinity.mime
diff --git a/ubuntu/maverick/kdeadmin/debian/ksysv-trinity.install b/ubuntu/_base/kdeadmin/debian/ksysv-trinity.install
index 10cd19549..10cd19549 100644
--- a/ubuntu/maverick/kdeadmin/debian/ksysv-trinity.install
+++ b/ubuntu/_base/kdeadmin/debian/ksysv-trinity.install
diff --git a/ubuntu/maverick/kdeadmin/debian/ksysv-trinity.manpages b/ubuntu/_base/kdeadmin/debian/ksysv-trinity.manpages
index eac192172..eac192172 100644
--- a/ubuntu/maverick/kdeadmin/debian/ksysv-trinity.manpages
+++ b/ubuntu/_base/kdeadmin/debian/ksysv-trinity.manpages
diff --git a/ubuntu/maverick/kdeadmin/debian/ksysv-trinity.menu b/ubuntu/_base/kdeadmin/debian/ksysv-trinity.menu
index 74953dc41..74953dc41 100644
--- a/ubuntu/maverick/kdeadmin/debian/ksysv-trinity.menu
+++ b/ubuntu/_base/kdeadmin/debian/ksysv-trinity.menu
diff --git a/ubuntu/maverick/kdeadmin/debian/kuser-trinity.install b/ubuntu/_base/kdeadmin/debian/kuser-trinity.install
index a941c76e5..a941c76e5 100644
--- a/ubuntu/maverick/kdeadmin/debian/kuser-trinity.install
+++ b/ubuntu/_base/kdeadmin/debian/kuser-trinity.install
diff --git a/ubuntu/maverick/kdeadmin/debian/kuser-trinity.manpages b/ubuntu/_base/kdeadmin/debian/kuser-trinity.manpages
index 917414a2d..917414a2d 100644
--- a/ubuntu/maverick/kdeadmin/debian/kuser-trinity.manpages
+++ b/ubuntu/_base/kdeadmin/debian/kuser-trinity.manpages
diff --git a/ubuntu/maverick/kdeadmin/debian/kuser-trinity.menu b/ubuntu/_base/kdeadmin/debian/kuser-trinity.menu
index d610c6835..d610c6835 100644
--- a/ubuntu/maverick/kdeadmin/debian/kuser-trinity.menu
+++ b/ubuntu/_base/kdeadmin/debian/kuser-trinity.menu
diff --git a/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.install b/ubuntu/_base/kdeadmin/debian/lilo-config-trinity.install
index ca3d4e06e..ca3d4e06e 100644
--- a/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.install
+++ b/ubuntu/_base/kdeadmin/debian/lilo-config-trinity.install
diff --git a/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.lintian b/ubuntu/_base/kdeadmin/debian/lilo-config-trinity.lintian
index e37a33b77..e37a33b77 100644
--- a/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.lintian
+++ b/ubuntu/_base/kdeadmin/debian/lilo-config-trinity.lintian
diff --git a/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.menu b/ubuntu/_base/kdeadmin/debian/lilo-config-trinity.menu
index 3f2bfca36..3f2bfca36 100644
--- a/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.menu
+++ b/ubuntu/_base/kdeadmin/debian/lilo-config-trinity.menu
diff --git a/ubuntu/maverick/kdeadmin/debian/man/kcron-trinity.sgml b/ubuntu/_base/kdeadmin/debian/man/kcron-trinity.sgml
index 0a3f9b243..0a3f9b243 100644
--- a/ubuntu/maverick/kdeadmin/debian/man/kcron-trinity.sgml
+++ b/ubuntu/_base/kdeadmin/debian/man/kcron-trinity.sgml
diff --git a/ubuntu/maverick/kdeadmin/debian/man/kdat-trinity.sgml b/ubuntu/_base/kdeadmin/debian/man/kdat-trinity.sgml
index a41eee990..a41eee990 100644
--- a/ubuntu/maverick/kdeadmin/debian/man/kdat-trinity.sgml
+++ b/ubuntu/_base/kdeadmin/debian/man/kdat-trinity.sgml
diff --git a/ubuntu/maverick/kdeadmin/debian/man/kpackage-trinity.sgml b/ubuntu/_base/kdeadmin/debian/man/kpackage-trinity.sgml
index cd625d943..cd625d943 100644
--- a/ubuntu/maverick/kdeadmin/debian/man/kpackage-trinity.sgml
+++ b/ubuntu/_base/kdeadmin/debian/man/kpackage-trinity.sgml
diff --git a/ubuntu/maverick/kdeadmin/debian/man/ksysv-trinity.sgml b/ubuntu/_base/kdeadmin/debian/man/ksysv-trinity.sgml
index afa872590..afa872590 100644
--- a/ubuntu/maverick/kdeadmin/debian/man/ksysv-trinity.sgml
+++ b/ubuntu/_base/kdeadmin/debian/man/ksysv-trinity.sgml
diff --git a/ubuntu/maverick/kdeadmin/debian/man/kuser-trinity.sgml b/ubuntu/_base/kdeadmin/debian/man/kuser-trinity.sgml
index c9ba9ac91..c9ba9ac91 100644
--- a/ubuntu/maverick/kdeadmin/debian/man/kuser-trinity.sgml
+++ b/ubuntu/_base/kdeadmin/debian/man/kuser-trinity.sgml
diff --git a/ubuntu/maverick/kdeadmin/debian/man/secpolicy-trinity.sgml b/ubuntu/_base/kdeadmin/debian/man/secpolicy-trinity.sgml
index a3217d584..a3217d584 100644
--- a/ubuntu/maverick/kdeadmin/debian/man/secpolicy-trinity.sgml
+++ b/ubuntu/_base/kdeadmin/debian/man/secpolicy-trinity.sgml
diff --git a/ubuntu/maverick/kdeadmin/debian/not-installed.list b/ubuntu/_base/kdeadmin/debian/not-installed.list
index 22bedffe4..22bedffe4 100644
--- a/ubuntu/maverick/kdeadmin/debian/not-installed.list
+++ b/ubuntu/_base/kdeadmin/debian/not-installed.list
diff --git a/ubuntu/maverick/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdeadmin/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdeadmin/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdeadmin/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdeadmin/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdeadmin/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdeadmin/debian/patches/series b/ubuntu/_base/kdeadmin/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdeadmin/debian/patches/series
+++ b/ubuntu/_base/kdeadmin/debian/patches/series
diff --git a/ubuntu/maverick/kdeadmin/debian/rules b/ubuntu/_base/kdeadmin/debian/rules
index 9a3c17683..9a3c17683 100755
--- a/ubuntu/maverick/kdeadmin/debian/rules
+++ b/ubuntu/_base/kdeadmin/debian/rules
diff --git a/ubuntu/maverick/kdeadmin/debian/source/format b/ubuntu/_base/kdeadmin/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdeadmin/debian/source/format
+++ b/ubuntu/_base/kdeadmin/debian/source/format
diff --git a/ubuntu/maverick/kdeadmin/debian/source/options b/ubuntu/_base/kdeadmin/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdeadmin/debian/source/options
+++ b/ubuntu/_base/kdeadmin/debian/source/options
diff --git a/ubuntu/maverick/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 6208667e9..6208667e9 100644
--- a/ubuntu/maverick/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdeartwork/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdeartwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdeartwork/debian/cdbs/debian-qt-kde.mk
index 5ea4b9a12..5ea4b9a12 100644
--- a/ubuntu/maverick/kdeartwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdeartwork/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdeartwork/debian/cdbs/kde.mk b/ubuntu/_base/kdeartwork/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/kdeartwork/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdeartwork/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdeartwork/debian/cdbs/versions.pl b/ubuntu/_base/kdeartwork/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdeartwork/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdeartwork/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdeartwork/debian/changelog b/ubuntu/_base/kdeartwork/debian/changelog
index e12914d14..e12914d14 100644
--- a/ubuntu/maverick/kdeartwork/debian/changelog
+++ b/ubuntu/_base/kdeartwork/debian/changelog
diff --git a/ubuntu/maverick/kdeartwork/debian/compat b/ubuntu/_base/kdeartwork/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdeartwork/debian/compat
+++ b/ubuntu/_base/kdeartwork/debian/compat
diff --git a/ubuntu/maverick/kdeartwork/debian/control b/ubuntu/_base/kdeartwork/debian/control
index 9b1e84b9a..9b1e84b9a 100644
--- a/ubuntu/maverick/kdeartwork/debian/control
+++ b/ubuntu/_base/kdeartwork/debian/control
diff --git a/ubuntu/maverick/kdeartwork/debian/copyright b/ubuntu/_base/kdeartwork/debian/copyright
index ae0c0cb2d..ae0c0cb2d 100644
--- a/ubuntu/maverick/kdeartwork/debian/copyright
+++ b/ubuntu/_base/kdeartwork/debian/copyright
diff --git a/ubuntu/maverick/kdeartwork/debian/kdeartwork-emoticons-trinity.install b/ubuntu/_base/kdeartwork/debian/kdeartwork-emoticons-trinity.install
index 0fea42334..0fea42334 100644
--- a/ubuntu/maverick/kdeartwork/debian/kdeartwork-emoticons-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kdeartwork-emoticons-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kdeartwork-misc-trinity.install b/ubuntu/_base/kdeartwork/debian/kdeartwork-misc-trinity.install
index 0285201e7..0285201e7 100644
--- a/ubuntu/maverick/kdeartwork/debian/kdeartwork-misc-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kdeartwork-misc-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kdeartwork-style-trinity.install b/ubuntu/_base/kdeartwork/debian/kdeartwork-style-trinity.install
index 8fab1bcbf..8fab1bcbf 100644
--- a/ubuntu/maverick/kdeartwork/debian/kdeartwork-style-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kdeartwork-style-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kdeartwork-theme-icon-trinity.install b/ubuntu/_base/kdeartwork/debian/kdeartwork-theme-icon-trinity.install
index 8a1dc19a0..8a1dc19a0 100644
--- a/ubuntu/maverick/kdeartwork/debian/kdeartwork-theme-icon-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kdeartwork-theme-icon-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kdeartwork-theme-window-trinity.install b/ubuntu/_base/kdeartwork/debian/kdeartwork-theme-window-trinity.install
index 7f688e236..7f688e236 100644
--- a/ubuntu/maverick/kdeartwork/debian/kdeartwork-theme-window-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kdeartwork-theme-window-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kdeartwork.README.Debian b/ubuntu/_base/kdeartwork/debian/kdeartwork.README.Debian
index 1b9dfa1a7..1b9dfa1a7 100644
--- a/ubuntu/maverick/kdeartwork/debian/kdeartwork.README.Debian
+++ b/ubuntu/_base/kdeartwork/debian/kdeartwork.README.Debian
diff --git a/ubuntu/maverick/kdeartwork/debian/kdewallpapers-trinity.install b/ubuntu/_base/kdeartwork/debian/kdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/ubuntu/maverick/kdeartwork/debian/kdewallpapers-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kdewallpapers-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install b/ubuntu/_base/kdeartwork/debian/kscreensaver-trinity.install
index d65c099dc..d65c099dc 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kscreensaver-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.manpages b/ubuntu/_base/kdeartwork/debian/kscreensaver-trinity.manpages
index 839491dbc..839491dbc 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.manpages
+++ b/ubuntu/_base/kdeartwork/debian/kscreensaver-trinity.manpages
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
index f58d9f076..f58d9f076 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-trinity.install
index 2657a6d03..2657a6d03 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.manpages b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-trinity.manpages
index 356af4f32..356af4f32 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.manpages
+++ b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-trinity.manpages
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
index f11cf310b..f11cf310b 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
+++ b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-webcollage-trinity.install
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian
index c3dd2d9d5..c3dd2d9d5 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian
+++ b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers-webcollage.README.Debian
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers.README.Debian b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers.README.Debian
index 828861775..828861775 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers.README.Debian
+++ b/ubuntu/_base/kdeartwork/debian/kscreensaver-xsavers.README.Debian
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver.README.Debian b/ubuntu/_base/kdeartwork/debian/kscreensaver.README.Debian
index 68584d330..68584d330 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver.README.Debian
+++ b/ubuntu/_base/kdeartwork/debian/kscreensaver.README.Debian
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kbanner-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kbanner-trinity.kss.1
index 4c3a1964c..4c3a1964c 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kbanner-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kbanner-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kblob-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kblob-trinity.kss.1
index 8f2b38cff..8f2b38cff 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kblob-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kblob-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kclock-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kclock-trinity.kss.1
index 648f98209..648f98209 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kclock-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kclock-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/keuphoria-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/keuphoria-trinity.kss.1
index c9c8bada4..c9c8bada4 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/keuphoria-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/keuphoria-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kfiresaver-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kfiresaver-trinity.kss.1
index b358c1e11..b358c1e11 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kfiresaver-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kfiresaver-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kflux-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kflux-trinity.kss.1
index cd27e8b6a..cd27e8b6a 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kflux-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kflux-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kfountain-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kfountain-trinity.kss.1
index 1f35016e9..1f35016e9 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kfountain-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kfountain-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kgravity-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kgravity-trinity.kss.1
index cf78f15ee..cf78f15ee 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kgravity-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kgravity-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/klines-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/klines-trinity.kss.1
index f67109e5c..f67109e5c 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/klines-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/klines-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/klorenz-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/klorenz-trinity.kss.1
index 4b69e2342..4b69e2342 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/klorenz-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/klorenz-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kpartsaver-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kpartsaver-trinity.kss.1
index 64a0a5c45..64a0a5c45 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kpartsaver-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kpartsaver-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kpendulum-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kpendulum-trinity.kss.1
index 8bf751d4c..8bf751d4c 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kpendulum-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kpendulum-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kpolygon-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kpolygon-trinity.kss.1
index 0d8d84cf3..0d8d84cf3 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kpolygon-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kpolygon-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/krotation-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/krotation-trinity.kss.1
index de4ca5949..de4ca5949 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/krotation-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/krotation-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kscience-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kscience-trinity.kss.1
index fb402a11c..fb402a11c 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kscience-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kscience-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kslideshow-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kslideshow-trinity.kss.1
index d067494ba..d067494ba 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kslideshow-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kslideshow-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/ksolarwinds-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/ksolarwinds-trinity.kss.1
index cecb4bc78..cecb4bc78 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/ksolarwinds-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/ksolarwinds-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kspace-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kspace-trinity.kss.1
index cf462ff70..cf462ff70 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kspace-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kspace-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kswarm-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kswarm-trinity.kss.1
index cf7818dcb..cf7818dcb 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kswarm-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kswarm-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kvm-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kvm-trinity.kss.1
index ba91c6bb6..ba91c6bb6 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kvm-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kvm-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kwave-trinity.kss.1 b/ubuntu/_base/kdeartwork/debian/man/kwave-trinity.kss.1
index 9c6268e67..9c6268e67 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kwave-trinity.kss.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kwave-trinity.kss.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kxsconfig-trinity.1 b/ubuntu/_base/kdeartwork/debian/man/kxsconfig-trinity.1
index 4db4d707b..4db4d707b 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kxsconfig-trinity.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kxsconfig-trinity.1
diff --git a/ubuntu/maverick/kdeartwork/debian/man/kxsrun-trinity.1 b/ubuntu/_base/kdeartwork/debian/man/kxsrun-trinity.1
index 4c77abe31..4c77abe31 100644
--- a/ubuntu/maverick/kdeartwork/debian/man/kxsrun-trinity.1
+++ b/ubuntu/_base/kdeartwork/debian/man/kxsrun-trinity.1
diff --git a/ubuntu/maverick/kdeartwork/debian/patches/series b/ubuntu/_base/kdeartwork/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdeartwork/debian/patches/series
+++ b/ubuntu/_base/kdeartwork/debian/patches/series
diff --git a/ubuntu/maverick/kdeartwork/debian/rules b/ubuntu/_base/kdeartwork/debian/rules
index 3c40130e7..3c40130e7 100755
--- a/ubuntu/maverick/kdeartwork/debian/rules
+++ b/ubuntu/_base/kdeartwork/debian/rules
diff --git a/ubuntu/maverick/kdeartwork/debian/source/format b/ubuntu/_base/kdeartwork/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdeartwork/debian/source/format
+++ b/ubuntu/_base/kdeartwork/debian/source/format
diff --git a/ubuntu/maverick/kdeartwork/debian/source/options b/ubuntu/_base/kdeartwork/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdeartwork/debian/source/options
+++ b/ubuntu/_base/kdeartwork/debian/source/options
diff --git a/ubuntu/maverick/kdebase/debian/.directory b/ubuntu/_base/kdebase/debian/.directory
index 4bbcf2c6a..4bbcf2c6a 100644
--- a/ubuntu/maverick/kdebase/debian/.directory
+++ b/ubuntu/_base/kdebase/debian/.directory
diff --git a/ubuntu/maverick/kdebase/debian/80ubuntu-xmodmap b/ubuntu/_base/kdebase/debian/80ubuntu-xmodmap
index 7774dd9b8..7774dd9b8 100644
--- a/ubuntu/maverick/kdebase/debian/80ubuntu-xmodmap
+++ b/ubuntu/_base/kdebase/debian/80ubuntu-xmodmap
diff --git a/ubuntu/maverick/kdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/_base/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
index 554f855b6..554f855b6 100644
--- a/ubuntu/maverick/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/_base/kdebase/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/ubuntu/maverick/kdebase/debian/NEWS b/ubuntu/_base/kdebase/debian/NEWS
index 143897e3e..143897e3e 100644
--- a/ubuntu/maverick/kdebase/debian/NEWS
+++ b/ubuntu/_base/kdebase/debian/NEWS
diff --git a/ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdebase/debian/cdbs/debian-qt-kde.mk
index 3bd77b8f7..3bd77b8f7 100644
--- a/ubuntu/maverick/kdebase/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdebase/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdebase/debian/cdbs/kde.mk b/ubuntu/_base/kdebase/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/kdebase/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdebase/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdebase/debian/cdbs/versions.pl b/ubuntu/_base/kdebase/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdebase/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdebase/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdebase/debian/changelog b/ubuntu/_base/kdebase/debian/changelog
index 9742e6bde..9742e6bde 100644
--- a/ubuntu/maverick/kdebase/debian/changelog
+++ b/ubuntu/_base/kdebase/debian/changelog
diff --git a/ubuntu/maverick/kdebase/debian/compat b/ubuntu/_base/kdebase/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdebase/debian/compat
+++ b/ubuntu/_base/kdebase/debian/compat
diff --git a/ubuntu/maverick/kdebase/debian/control b/ubuntu/_base/kdebase/debian/control
index 2cd69a996..2cd69a996 100644
--- a/ubuntu/maverick/kdebase/debian/control
+++ b/ubuntu/_base/kdebase/debian/control
diff --git a/ubuntu/maverick/kdebase/debian/copyright b/ubuntu/_base/kdebase/debian/copyright
index 8e0933735..8e0933735 100644
--- a/ubuntu/maverick/kdebase/debian/copyright
+++ b/ubuntu/_base/kdebase/debian/copyright
diff --git a/ubuntu/maverick/kdebase/debian/icons/kappfinder-16.xpm b/ubuntu/_base/kdebase/debian/icons/kappfinder-16.xpm
index 7190943d7..7190943d7 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kappfinder-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kappfinder-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kappfinder.xpm b/ubuntu/_base/kdebase/debian/icons/kappfinder.xpm
index f5d7c753f..f5d7c753f 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kappfinder.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kappfinder.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kate-16.xpm b/ubuntu/_base/kdebase/debian/icons/kate-16.xpm
index f77128d44..f77128d44 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kate-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kate-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kate.xpm b/ubuntu/_base/kdebase/debian/icons/kate.xpm
index be7d87b81..be7d87b81 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kate.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kate.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kcontrol-16.xpm b/ubuntu/_base/kdebase/debian/icons/kcontrol-16.xpm
index 6597a17c4..6597a17c4 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kcontrol-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kcontrol-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kcontrol.xpm b/ubuntu/_base/kdebase/debian/icons/kcontrol.xpm
index 15acc56d5..15acc56d5 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kcontrol.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kcontrol.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kdeprint-16.xpm b/ubuntu/_base/kdebase/debian/icons/kdeprint-16.xpm
index 4f03a0b06..4f03a0b06 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kdeprint-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kdeprint-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kdeprint.xpm b/ubuntu/_base/kdebase/debian/icons/kdeprint.xpm
index f11005860..f11005860 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kdeprint.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kdeprint.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kdeprintfax-16.xpm b/ubuntu/_base/kdebase/debian/icons/kdeprintfax-16.xpm
index debb554b6..debb554b6 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kdeprintfax-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kdeprintfax-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kdeprintfax.xpm b/ubuntu/_base/kdebase/debian/icons/kdeprintfax.xpm
index 6af142f57..6af142f57 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kdeprintfax.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kdeprintfax.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/keditbookmarks-16.xpm b/ubuntu/_base/kdebase/debian/icons/keditbookmarks-16.xpm
index 0006e7f3a..0006e7f3a 100644
--- a/ubuntu/maverick/kdebase/debian/icons/keditbookmarks-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/keditbookmarks-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/keditbookmarks.xpm b/ubuntu/_base/kdebase/debian/icons/keditbookmarks.xpm
index 545b24722..545b24722 100644
--- a/ubuntu/maverick/kdebase/debian/icons/keditbookmarks.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/keditbookmarks.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kfind-16.xpm b/ubuntu/_base/kdebase/debian/icons/kfind-16.xpm
index d00be036e..d00be036e 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kfind-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kfind-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kfind.xpm b/ubuntu/_base/kdebase/debian/icons/kfind.xpm
index 95394fe53..95394fe53 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kfind.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kfind.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kfm-16.xpm b/ubuntu/_base/kdebase/debian/icons/kfm-16.xpm
index 6de4eaf08..6de4eaf08 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kfm-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kfm-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kfm.xpm b/ubuntu/_base/kdebase/debian/icons/kfm.xpm
index 2aa9dd403..2aa9dd403 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kfm.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kfm.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/khelpcenter-16.xpm b/ubuntu/_base/kdebase/debian/icons/khelpcenter-16.xpm
index 666524486..666524486 100644
--- a/ubuntu/maverick/kdebase/debian/icons/khelpcenter-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/khelpcenter-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/khelpcenter.xpm b/ubuntu/_base/kdebase/debian/icons/khelpcenter.xpm
index 3cfbba7bd..3cfbba7bd 100644
--- a/ubuntu/maverick/kdebase/debian/icons/khelpcenter.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/khelpcenter.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kicker.xpm b/ubuntu/_base/kdebase/debian/icons/kicker.xpm
index f5fcce72c..f5fcce72c 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kicker.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kicker.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kinfocenter-16.xpm b/ubuntu/_base/kdebase/debian/icons/kinfocenter-16.xpm
index 615bbf46b..615bbf46b 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kinfocenter-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kinfocenter-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kinfocenter.xpm b/ubuntu/_base/kdebase/debian/icons/kinfocenter.xpm
index 04fcb0013..04fcb0013 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kinfocenter.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kinfocenter.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kjobviewer-16.xpm b/ubuntu/_base/kdebase/debian/icons/kjobviewer-16.xpm
index ed1bcc38f..ed1bcc38f 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kjobviewer-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kjobviewer-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kjobviewer.xpm b/ubuntu/_base/kdebase/debian/icons/kjobviewer.xpm
index 8ad886325..8ad886325 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kjobviewer.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kjobviewer.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/klipper-16.xpm b/ubuntu/_base/kdebase/debian/icons/klipper-16.xpm
index 82115ab2a..82115ab2a 100644
--- a/ubuntu/maverick/kdebase/debian/icons/klipper-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/klipper-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/klipper.xpm b/ubuntu/_base/kdebase/debian/icons/klipper.xpm
index aaafd1d03..aaafd1d03 100644
--- a/ubuntu/maverick/kdebase/debian/icons/klipper.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/klipper.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kmenuedit-16.xpm b/ubuntu/_base/kdebase/debian/icons/kmenuedit-16.xpm
index d7af0faa8..d7af0faa8 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kmenuedit-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kmenuedit-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kmenuedit.xpm b/ubuntu/_base/kdebase/debian/icons/kmenuedit.xpm
index 87297263b..87297263b 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kmenuedit.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kmenuedit.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/konqueror-16.xpm b/ubuntu/_base/kdebase/debian/icons/konqueror-16.xpm
index ece87a112..ece87a112 100644
--- a/ubuntu/maverick/kdebase/debian/icons/konqueror-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/konqueror-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/konqueror.xpm b/ubuntu/_base/kdebase/debian/icons/konqueror.xpm
index 6700a9f44..6700a9f44 100644
--- a/ubuntu/maverick/kdebase/debian/icons/konqueror.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/konqueror.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/konsole-16.xpm b/ubuntu/_base/kdebase/debian/icons/konsole-16.xpm
index 3be52807f..3be52807f 100644
--- a/ubuntu/maverick/kdebase/debian/icons/konsole-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/konsole-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/konsole.xpm b/ubuntu/_base/kdebase/debian/icons/konsole.xpm
index 445cf4409..445cf4409 100644
--- a/ubuntu/maverick/kdebase/debian/icons/konsole.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/konsole.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kpager-16.xpm b/ubuntu/_base/kdebase/debian/icons/kpager-16.xpm
index e9360e56f..e9360e56f 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kpager-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kpager-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kpager.xpm b/ubuntu/_base/kdebase/debian/icons/kpager.xpm
index 71b895ccf..71b895ccf 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kpager.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kpager.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kpersonalizer-16.xpm b/ubuntu/_base/kdebase/debian/icons/kpersonalizer-16.xpm
index fab4574ac..fab4574ac 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kpersonalizer-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kpersonalizer-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kpersonalizer.xpm b/ubuntu/_base/kdebase/debian/icons/kpersonalizer.xpm
index 9f22bca3a..9f22bca3a 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kpersonalizer.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kpersonalizer.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/ksysguard-16.xpm b/ubuntu/_base/kdebase/debian/icons/ksysguard-16.xpm
index 4ca56f859..4ca56f859 100644
--- a/ubuntu/maverick/kdebase/debian/icons/ksysguard-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/ksysguard-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/ksysguard.xpm b/ubuntu/_base/kdebase/debian/icons/ksysguard.xpm
index a4423436a..a4423436a 100644
--- a/ubuntu/maverick/kdebase/debian/icons/ksysguard.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/ksysguard.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/ktip-16.xpm b/ubuntu/_base/kdebase/debian/icons/ktip-16.xpm
index 84b879a0f..84b879a0f 100644
--- a/ubuntu/maverick/kdebase/debian/icons/ktip-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/ktip-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/ktip.xpm b/ubuntu/_base/kdebase/debian/icons/ktip.xpm
index beda416c0..beda416c0 100644
--- a/ubuntu/maverick/kdebase/debian/icons/ktip.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/ktip.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kwrite-16.xpm b/ubuntu/_base/kdebase/debian/icons/kwrite-16.xpm
index 47a6d14c2..47a6d14c2 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kwrite-16.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kwrite-16.xpm
diff --git a/ubuntu/maverick/kdebase/debian/icons/kwrite.xpm b/ubuntu/_base/kdebase/debian/icons/kwrite.xpm
index adef05a7c..adef05a7c 100644
--- a/ubuntu/maverick/kdebase/debian/icons/kwrite.xpm
+++ b/ubuntu/_base/kdebase/debian/icons/kwrite.xpm
diff --git a/ubuntu/maverick/kdebase/debian/img/cr128-app-energy_star.png.uu b/ubuntu/_base/kdebase/debian/img/cr128-app-energy_star.png.uu
index 0d74bb8ef..0d74bb8ef 100644
--- a/ubuntu/maverick/kdebase/debian/img/cr128-app-energy_star.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/cr128-app-energy_star.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/cr16-app-energy_star.png.uu b/ubuntu/_base/kdebase/debian/img/cr16-app-energy_star.png.uu
index 174f00947..174f00947 100644
--- a/ubuntu/maverick/kdebase/debian/img/cr16-app-energy_star.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/cr16-app-energy_star.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/cr32-app-energy_star.png.uu b/ubuntu/_base/kdebase/debian/img/cr32-app-energy_star.png.uu
index 77c6322f4..77c6322f4 100644
--- a/ubuntu/maverick/kdebase/debian/img/cr32-app-energy_star.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/cr32-app-energy_star.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/cr48-app-energy_star.png.uu b/ubuntu/_base/kdebase/debian/img/cr48-app-energy_star.png.uu
index 0be925842..0be925842 100644
--- a/ubuntu/maverick/kdebase/debian/img/cr48-app-energy_star.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/cr48-app-energy_star.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/cr64-app-energy_star.png.uu b/ubuntu/_base/kdebase/debian/img/cr64-app-energy_star.png.uu
index 0691c9b78..0691c9b78 100644
--- a/ubuntu/maverick/kdebase/debian/img/cr64-app-energy_star.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/cr64-app-energy_star.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-compact_flash_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_mount_decrypt.png.uu
index e1ce7f93c..e1ce7f93c 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-compact_flash_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_decrypt.png.uu
index e120aa624..e120aa624 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu
index 1bcc196b8..1bcc196b8 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-hdd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-hdd_mount_decrypt.png.uu
index 1faca818e..1faca818e 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-hdd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-hdd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_decrypt.png.uu
index 5efdd39cf..5efdd39cf 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_encrypt.png.uu
index 001302e40..001302e40 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-hdd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-memory_stick_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_mount_decrypt.png.uu
index f5b085db1..f5b085db1 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-memory_stick_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_decrypt.png.uu
index 0c4739034..0c4739034 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_encrypt.png.uu
index 5f7c14f94..5f7c14f94 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-memory_stick_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-sd_mmc_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_mount_decrypt.png.uu
index 6e7c08100..6e7c08100 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-sd_mmc_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_decrypt.png.uu
index 85c3adde8..85c3adde8 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu
index 53ba3286d..53ba3286d 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-smart_media_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_mount_decrypt.png.uu
index 6a55ab325..6a55ab325 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-smart_media_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_decrypt.png.uu
index 4f6e8724b..4f6e8724b 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_encrypt.png.uu
index fcdc11188..fcdc11188 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-smart_media_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-usbpendrive_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_mount_decrypt.png.uu
index d8dbd0dd3..d8dbd0dd3 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-usbpendrive_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_decrypt.png.uu
index 750c23ad0..750c23ad0 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu
index 95cd850b0..95cd850b0 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdrom_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_mount_decrypt.png.uu
index 5fb99058c..5fb99058c 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdrom_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_decrypt.png.uu
index 836500512..836500512 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_encrypt.png.uu
index 0a5c93dae..0a5c93dae 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdrom_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdwriter_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_mount_decrypt.png.uu
index 5a2a23edf..5a2a23edf 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdwriter_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_decrypt.png.uu
index 7fe7e8248..7fe7e8248 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_encrypt.png.uu
index 92895323f..92895323f 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-cdwriter_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-compact_flash_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_mount_decrypt.png.uu
index f8c27365d..f8c27365d 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-compact_flash_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_decrypt.png.uu
index 98e09d689..98e09d689 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_encrypt.png.uu
index bb3129191..bb3129191 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-compact_flash_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-dvd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-dvd_mount_decrypt.png.uu
index b545f7568..b545f7568 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-dvd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-dvd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_decrypt.png.uu
index 210ef348d..210ef348d 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_encrypt.png.uu
index e39a8a485..e39a8a485 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-dvd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-hdd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-hdd_mount_decrypt.png.uu
index b1486c775..b1486c775 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-hdd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-hdd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_decrypt.png.uu
index d869de804..d869de804 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_encrypt.png.uu
index 354f7f21c..354f7f21c 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-hdd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-memory_stick_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_mount_decrypt.png.uu
index 737470366..737470366 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-memory_stick_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_decrypt.png.uu
index 70054404b..70054404b 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_encrypt.png.uu
index 39764b3e3..39764b3e3 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-memory_stick_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-sd_mmc_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_mount_decrypt.png.uu
index 63086600f..63086600f 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-sd_mmc_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_decrypt.png.uu
index c85192622..c85192622 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_encrypt.png.uu
index 418e620e0..418e620e0 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-smart_media_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_mount_decrypt.png.uu
index 552998454..552998454 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-smart_media_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_decrypt.png.uu
index 9b076147e..9b076147e 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_encrypt.png.uu
index 69bac80c7..69bac80c7 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-smart_media_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-usbpendrive_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_mount_decrypt.png.uu
index f1f7faa8e..f1f7faa8e 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-usbpendrive_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_decrypt.png.uu
index 075d4ea71..075d4ea71 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_encrypt.png.uu
index 953ca6b93..953ca6b93 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr16-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-compact_flash_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_mount_decrypt.png.uu
index 272ceb8cc..272ceb8cc 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-compact_flash_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_decrypt.png.uu
index 92bcedadd..92bcedadd 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_encrypt.png.uu
index 57da8caee..57da8caee 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-compact_flash_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-hdd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-hdd_mount_decrypt.png.uu
index 50e17852b..50e17852b 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-hdd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-hdd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_decrypt.png.uu
index f034e19df..f034e19df 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_encrypt.png.uu
index 0a014d451..0a014d451 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-hdd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-memory_stick_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_mount_decrypt.png.uu
index 0905f771d..0905f771d 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-memory_stick_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_decrypt.png.uu
index 789b3019b..789b3019b 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_encrypt.png.uu
index 37cec5dc1..37cec5dc1 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-memory_stick_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-sd_mmc_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_mount_decrypt.png.uu
index ab84cb1a1..ab84cb1a1 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-sd_mmc_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_decrypt.png.uu
index 7885d8754..7885d8754 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_encrypt.png.uu
index 3a6f906cf..3a6f906cf 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-smart_media_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_mount_decrypt.png.uu
index 159fed5c2..159fed5c2 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-smart_media_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_decrypt.png.uu
index 17f442be9..17f442be9 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_encrypt.png.uu
index 960e92610..960e92610 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-smart_media_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-usbpendrive_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_mount_decrypt.png.uu
index ecdd0a90c..ecdd0a90c 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-usbpendrive_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_decrypt.png.uu
index ee4921420..ee4921420 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_encrypt.png.uu
index 6f5ea1807..6f5ea1807 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr22-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdrom_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_mount_decrypt.png.uu
index 74a554911..74a554911 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdrom_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_decrypt.png.uu
index 806e8074f..806e8074f 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_encrypt.png.uu
index c8ba60fdc..c8ba60fdc 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdrom_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdwriter_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_mount_decrypt.png.uu
index 18008c39c..18008c39c 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdwriter_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_decrypt.png.uu
index a30ad546c..a30ad546c 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_encrypt.png.uu
index e03914895..e03914895 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-cdwriter_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-compact_flash_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_mount_decrypt.png.uu
index 52fdf856b..52fdf856b 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-compact_flash_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_decrypt.png.uu
index 0309a9f68..0309a9f68 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_encrypt.png.uu
index 3669e8353..3669e8353 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-compact_flash_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-dvd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-dvd_mount_decrypt.png.uu
index 5029383bc..5029383bc 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-dvd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-dvd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_decrypt.png.uu
index 534e71ea5..534e71ea5 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_encrypt.png.uu
index 9f61db493..9f61db493 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-dvd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-hdd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-hdd_mount_decrypt.png.uu
index be4deacb4..be4deacb4 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-hdd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-hdd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_decrypt.png.uu
index ceda221ba..ceda221ba 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_encrypt.png.uu
index ad7573d03..ad7573d03 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-hdd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-memory_stick_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_mount_decrypt.png.uu
index d61c326d7..d61c326d7 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-memory_stick_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_decrypt.png.uu
index b20e824fe..b20e824fe 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_encrypt.png.uu
index ccc177262..ccc177262 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-memory_stick_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-sd_mmc_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_mount_decrypt.png.uu
index 6adfa859d..6adfa859d 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-sd_mmc_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_decrypt.png.uu
index c623b32fa..c623b32fa 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_encrypt.png.uu
index 0f7ce0a20..0f7ce0a20 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-smart_media_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_mount_decrypt.png.uu
index 46bcb9d93..46bcb9d93 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-smart_media_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_decrypt.png.uu
index 63abdf67a..63abdf67a 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_encrypt.png.uu
index bf7be270c..bf7be270c 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-smart_media_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-usbpendrive_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_mount_decrypt.png.uu
index eb2514e60..eb2514e60 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-usbpendrive_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_decrypt.png.uu
index 8fd93cf8a..8fd93cf8a 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_encrypt.png.uu
index f1986ab2e..f1986ab2e 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr32-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdrom_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_mount_decrypt.png.uu
index 936db997e..936db997e 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdrom_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_decrypt.png.uu
index b7223ac67..b7223ac67 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_encrypt.png.uu
index 78593105d..78593105d 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdrom_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdwriter_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_mount_decrypt.png.uu
index 599869d4b..599869d4b 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdwriter_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_decrypt.png.uu
index 624a60244..624a60244 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_encrypt.png.uu
index 6c25e1d03..6c25e1d03 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-cdwriter_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-compact_flash_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_mount_decrypt.png.uu
index d9e8df13c..d9e8df13c 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-compact_flash_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_decrypt.png.uu
index c334e7acd..c334e7acd 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_encrypt.png.uu
index 463332e01..463332e01 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-compact_flash_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-dvd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-dvd_mount_decrypt.png.uu
index 7a15b0e41..7a15b0e41 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-dvd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-dvd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_decrypt.png.uu
index 2fb798d26..2fb798d26 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_encrypt.png.uu
index 225ab645b..225ab645b 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-dvd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-hdd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-hdd_mount_decrypt.png.uu
index e2b3f32a7..e2b3f32a7 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-hdd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-hdd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_decrypt.png.uu
index f52d063e1..f52d063e1 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_encrypt.png.uu
index 16918ac4e..16918ac4e 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-hdd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-memory_stick_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_mount_decrypt.png.uu
index 2e792a850..2e792a850 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-memory_stick_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_decrypt.png.uu
index b751b85e6..b751b85e6 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_encrypt.png.uu
index 8b7eb9fdb..8b7eb9fdb 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-memory_stick_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-sd_mmc_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_mount_decrypt.png.uu
index 7c17083d4..7c17083d4 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-sd_mmc_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_decrypt.png.uu
index d381f505b..d381f505b 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_encrypt.png.uu
index 63afcf3d5..63afcf3d5 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-smart_media_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_mount_decrypt.png.uu
index afe24e0af..afe24e0af 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-smart_media_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_decrypt.png.uu
index ed026b22f..ed026b22f 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_encrypt.png.uu
index 8c2678cd9..8c2678cd9 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-smart_media_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-usbpendrive_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_mount_decrypt.png.uu
index 72684150b..72684150b 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-usbpendrive_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_decrypt.png.uu
index 190f0cd1f..190f0cd1f 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_encrypt.png.uu
index c6bc477ae..c6bc477ae 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr48-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdrom_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_mount_decrypt.png.uu
index c8b9b7ca4..c8b9b7ca4 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdrom_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_decrypt.png.uu
index 0d0d3c11e..0d0d3c11e 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_encrypt.png.uu
index ebe585cbb..ebe585cbb 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdrom_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdwriter_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_mount_decrypt.png.uu
index bcb2b8997..bcb2b8997 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdwriter_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_decrypt.png.uu
index 4911d88d8..4911d88d8 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_encrypt.png.uu
index 208cc66d2..208cc66d2 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-cdwriter_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-compact_flash_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_mount_decrypt.png.uu
index 713fc6fd6..713fc6fd6 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-compact_flash_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_decrypt.png.uu
index 7500596d4..7500596d4 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_encrypt.png.uu
index 90edd0f12..90edd0f12 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-compact_flash_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-dvd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-dvd_mount_decrypt.png.uu
index ed1fadab4..ed1fadab4 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-dvd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-dvd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_decrypt.png.uu
index 261d2e37a..261d2e37a 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_encrypt.png.uu
index dec39b151..dec39b151 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-dvd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-hdd_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-hdd_mount_decrypt.png.uu
index 030abba36..030abba36 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-hdd_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-hdd_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_decrypt.png.uu
index d5627b06e..d5627b06e 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_encrypt.png.uu
index 9274c6609..9274c6609 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-hdd_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-memory_stick_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_mount_decrypt.png.uu
index 7e80b6f9d..7e80b6f9d 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-memory_stick_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_decrypt.png.uu
index e54571d72..e54571d72 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_encrypt.png.uu
index 491ab6c79..491ab6c79 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-memory_stick_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-sd_mmc_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_mount_decrypt.png.uu
index e3cac2e09..e3cac2e09 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-sd_mmc_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_decrypt.png.uu
index 7cd11e4f8..7cd11e4f8 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_encrypt.png.uu
index 3fd792720..3fd792720 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-sd_mmc_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-smart_media_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_mount_decrypt.png.uu
index 34e05ddad..34e05ddad 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-smart_media_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_decrypt.png.uu
index 2cb7d8cdc..2cb7d8cdc 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_encrypt.png.uu
index 245e7fec0..245e7fec0 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-smart_media_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-usbpendrive_mount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_mount_decrypt.png.uu
index a125f5101..a125f5101 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-usbpendrive_mount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_mount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_decrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_decrypt.png.uu
index b80ac75ac..b80ac75ac 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_decrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_decrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_encrypt.png.uu
index f37781c34..f37781c34 100644
--- a/ubuntu/maverick/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_encrypt.png.uu
+++ b/ubuntu/_base/kdebase/debian/img/medialuks/cr64-device-usbpendrive_unmount_encrypt.png.uu
diff --git a/ubuntu/maverick/kdebase/debian/kappfinder-trinity.install b/ubuntu/_base/kdebase/debian/kappfinder-trinity.install
index 864092754..864092754 100644
--- a/ubuntu/maverick/kdebase/debian/kappfinder-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kappfinder-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kappfinder-trinity.manpages b/ubuntu/_base/kdebase/debian/kappfinder-trinity.manpages
index b83ec9565..b83ec9565 100644
--- a/ubuntu/maverick/kdebase/debian/kappfinder-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kappfinder-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kappfinder-trinity.menu b/ubuntu/_base/kdebase/debian/kappfinder-trinity.menu
index 597600f9e..597600f9e 100644
--- a/ubuntu/maverick/kdebase/debian/kappfinder-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kappfinder-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kappfinder-trinity.postinst b/ubuntu/_base/kdebase/debian/kappfinder-trinity.postinst
index 24b3e6df3..24b3e6df3 100644
--- a/ubuntu/maverick/kdebase/debian/kappfinder-trinity.postinst
+++ b/ubuntu/_base/kdebase/debian/kappfinder-trinity.postinst
diff --git a/ubuntu/maverick/kdebase/debian/kate-trinity.install b/ubuntu/_base/kdebase/debian/kate-trinity.install
index 29e4419c1..29e4419c1 100644
--- a/ubuntu/maverick/kdebase/debian/kate-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kate-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kate-trinity.lintian b/ubuntu/_base/kdebase/debian/kate-trinity.lintian
index 80d27b09a..80d27b09a 100644
--- a/ubuntu/maverick/kdebase/debian/kate-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/kate-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/kate-trinity.manpages b/ubuntu/_base/kdebase/debian/kate-trinity.manpages
index 56b772103..56b772103 100644
--- a/ubuntu/maverick/kdebase/debian/kate-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kate-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kate-trinity.menu b/ubuntu/_base/kdebase/debian/kate-trinity.menu
index 378fa940e..378fa940e 100644
--- a/ubuntu/maverick/kdebase/debian/kate-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kate-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kate-trinity.mime b/ubuntu/_base/kdebase/debian/kate-trinity.mime
index c148c7556..c148c7556 100644
--- a/ubuntu/maverick/kdebase/debian/kate-trinity.mime
+++ b/ubuntu/_base/kdebase/debian/kate-trinity.mime
diff --git a/ubuntu/maverick/kdebase/debian/kcheckpass-trinity.pam b/ubuntu/_base/kdebase/debian/kcheckpass-trinity.pam
index 91e91979e..91e91979e 100644
--- a/ubuntu/maverick/kdebase/debian/kcheckpass-trinity.pam
+++ b/ubuntu/_base/kdebase/debian/kcheckpass-trinity.pam
diff --git a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.README.Debian b/ubuntu/_base/kdebase/debian/kcontrol-trinity.README.Debian
index 8c7926ad5..8c7926ad5 100644
--- a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.README.Debian
+++ b/ubuntu/_base/kdebase/debian/kcontrol-trinity.README.Debian
diff --git a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.install b/ubuntu/_base/kdebase/debian/kcontrol-trinity.install
index f337002f6..f337002f6 100644
--- a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kcontrol-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.lintian b/ubuntu/_base/kdebase/debian/kcontrol-trinity.lintian
index 2a4306011..2a4306011 100644
--- a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/kcontrol-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.menu b/ubuntu/_base/kdebase/debian/kcontrol-trinity.menu
index 7035a694c..7035a694c 100644
--- a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kcontrol-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.postinst b/ubuntu/_base/kdebase/debian/kcontrol-trinity.postinst
index 4733c3a43..4733c3a43 100644
--- a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.postinst
+++ b/ubuntu/_base/kdebase/debian/kcontrol-trinity.postinst
diff --git a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.postrm b/ubuntu/_base/kdebase/debian/kcontrol-trinity.postrm
index 3832d3be4..3832d3be4 100644
--- a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.postrm
+++ b/ubuntu/_base/kdebase/debian/kcontrol-trinity.postrm
diff --git a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.preinst b/ubuntu/_base/kdebase/debian/kcontrol-trinity.preinst
index 15a39d9f1..15a39d9f1 100644
--- a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.preinst
+++ b/ubuntu/_base/kdebase/debian/kcontrol-trinity.preinst
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-data-trinity.install b/ubuntu/_base/kdebase/debian/kdebase-data-trinity.install
index 22e1b5229..22e1b5229 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-data-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kdebase-data-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-data-trinity.preinst b/ubuntu/_base/kdebase/debian/kdebase-data-trinity.preinst
index 87dc6edc8..87dc6edc8 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-data-trinity.preinst
+++ b/ubuntu/_base/kdebase/debian/kdebase-data-trinity.preinst
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kate b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kate
index f4f9239d1..f4f9239d1 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kate
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kate
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kdeprint b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kdeprint
index 8e30926ad..8e30926ad 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kdeprint
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kdeprint
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kdm b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kdm
index 4e32f206e..4e32f206e 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kdm
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kdm
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kfind b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kfind
index 476a318e6..476a318e6 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kfind
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kfind
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kicker b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kicker
index 4bcbd8d10..4bcbd8d10 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kicker
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kicker
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.klipper b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.klipper
index 3e45ca5d9..3e45ca5d9 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.klipper
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.klipper
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kmenuedit b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kmenuedit
index adf0e7f9d..adf0e7f9d 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kmenuedit
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kmenuedit
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.konqueror b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.konqueror
index c787f146d..c787f146d 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.konqueror
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.konqueror
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.konsole b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.konsole
index 3a48ad8b9..3a48ad8b9 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.konsole
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.konsole
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kpager b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kpager
index 6e09225d5..6e09225d5 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.kpager
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.kpager
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.ksysguard b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.ksysguard
index 769402c90..769402c90 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-doc-html.doc-base.ksysguard
+++ b/ubuntu/_base/kdebase/debian/kdebase-doc-html.doc-base.ksysguard
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-kio-plugins-trinity.README.Debian b/ubuntu/_base/kdebase/debian/kdebase-kio-plugins-trinity.README.Debian
index b0b6e7322..b0b6e7322 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-kio-plugins-trinity.README.Debian
+++ b/ubuntu/_base/kdebase/debian/kdebase-kio-plugins-trinity.README.Debian
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-kio-plugins-trinity.install b/ubuntu/_base/kdebase/debian/kdebase-kio-plugins-trinity.install
index 63af941c4..63af941c4 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-kio-plugins-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kdebase-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-kio-plugins-trinity.manpages b/ubuntu/_base/kdebase/debian/kdebase-kio-plugins-trinity.manpages
index 41ee5f29a..41ee5f29a 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-kio-plugins-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kdebase-kio-plugins-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-runtime-data-common-trinity.install b/ubuntu/_base/kdebase/debian/kdebase-runtime-data-common-trinity.install
index e906f3a3f..e906f3a3f 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-runtime-data-common-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kdebase-runtime-data-common-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.install b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.install
index 4175ca1d4..4175ca1d4 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.install
+++ b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.install
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.links b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.links
index ae21842e4..ae21842e4 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.links
+++ b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.links
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.lintian b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.lintian
index 9f78d69c8..9f78d69c8 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.lintian
+++ b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.lintian
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.manpages b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.manpages
index b801c202a..b801c202a 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.manpages
+++ b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.menu b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.menu
index 071468466..071468466 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.menu
+++ b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.menu
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.postinst b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.postinst
index e385c4f34..e385c4f34 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.postinst
+++ b/ubuntu/_base/kdebase/debian/kdebase-trinity-bin.postinst
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-dev.install b/ubuntu/_base/kdebase/debian/kdebase-trinity-dev.install
index d9759729d..d9759729d 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-dev.install
+++ b/ubuntu/_base/kdebase/debian/kdebase-trinity-dev.install
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-doc.install b/ubuntu/_base/kdebase/debian/kdebase-trinity-doc.install
index daa650d9d..daa650d9d 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-doc.install
+++ b/ubuntu/_base/kdebase/debian/kdebase-trinity-doc.install
diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity.README.Debian b/ubuntu/_base/kdebase/debian/kdebase-trinity.README.Debian
index dcdf16ecc..dcdf16ecc 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity.README.Debian
+++ b/ubuntu/_base/kdebase/debian/kdebase-trinity.README.Debian
diff --git a/ubuntu/maverick/kdebase/debian/kdepasswd-trinity.install b/ubuntu/_base/kdebase/debian/kdepasswd-trinity.install
index cbf6a5ed1..cbf6a5ed1 100644
--- a/ubuntu/maverick/kdebase/debian/kdepasswd-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kdepasswd-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kdepasswd-trinity.manpages b/ubuntu/_base/kdebase/debian/kdepasswd-trinity.manpages
index 28a664117..28a664117 100644
--- a/ubuntu/maverick/kdebase/debian/kdepasswd-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kdepasswd-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kdepasswd-trinity.menu b/ubuntu/_base/kdebase/debian/kdepasswd-trinity.menu
index 3610102c0..3610102c0 100644
--- a/ubuntu/maverick/kdebase/debian/kdepasswd-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kdepasswd-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kdeprint-trinity.install b/ubuntu/_base/kdebase/debian/kdeprint-trinity.install
index 0c4e78ef3..0c4e78ef3 100644
--- a/ubuntu/maverick/kdebase/debian/kdeprint-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kdeprint-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kdeprint-trinity.lintian b/ubuntu/_base/kdebase/debian/kdeprint-trinity.lintian
index 156e04dc0..156e04dc0 100644
--- a/ubuntu/maverick/kdebase/debian/kdeprint-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/kdeprint-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/kdeprint-trinity.manpages b/ubuntu/_base/kdebase/debian/kdeprint-trinity.manpages
index 6d4136bf9..6d4136bf9 100644
--- a/ubuntu/maverick/kdebase/debian/kdeprint-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kdeprint-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kdeprint-trinity.menu b/ubuntu/_base/kdebase/debian/kdeprint-trinity.menu
index 3140de34c..3140de34c 100644
--- a/ubuntu/maverick/kdebase/debian/kdeprint-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kdeprint-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kdesktop-trinity.install b/ubuntu/_base/kdebase/debian/kdesktop-trinity.install
index aa950c6d5..aa950c6d5 100644
--- a/ubuntu/maverick/kdebase/debian/kdesktop-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kdesktop-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kdesktop-trinity.lintian b/ubuntu/_base/kdebase/debian/kdesktop-trinity.lintian
index c270fd6ae..c270fd6ae 100644
--- a/ubuntu/maverick/kdebase/debian/kdesktop-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/kdesktop-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/kdesktop-trinity.preinst b/ubuntu/_base/kdebase/debian/kdesktop-trinity.preinst
index fab4ef420..fab4ef420 100644
--- a/ubuntu/maverick/kdebase/debian/kdesktop-trinity.preinst
+++ b/ubuntu/_base/kdebase/debian/kdesktop-trinity.preinst
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity-np.pam b/ubuntu/_base/kdebase/debian/kdm-trinity-np.pam
index a13232b98..a13232b98 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity-np.pam
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity-np.pam
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.README.Debian b/ubuntu/_base/kdebase/debian/kdm-trinity.README.Debian
index ce2e68020..ce2e68020 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.README.Debian
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.README.Debian
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.conf b/ubuntu/_base/kdebase/debian/kdm-trinity.conf
index 554e5a38e..554e5a38e 100755
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.conf
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.conf
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.config b/ubuntu/_base/kdebase/debian/kdm-trinity.config
index 3525d7740..3525d7740 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.config
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.config
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.dirs b/ubuntu/_base/kdebase/debian/kdm-trinity.dirs
index 5a4196df0..5a4196df0 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.dirs
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.dirs
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.install b/ubuntu/_base/kdebase/debian/kdm-trinity.install
index 7ad3f65c2..7ad3f65c2 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.links b/ubuntu/_base/kdebase/debian/kdm-trinity.links
index 6c0a7dd8b..6c0a7dd8b 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.links
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.links
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.logrotate b/ubuntu/_base/kdebase/debian/kdm-trinity.logrotate
index 0c7bd75ef..0c7bd75ef 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.logrotate
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.logrotate
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.manpages b/ubuntu/_base/kdebase/debian/kdm-trinity.manpages
index fcbc540f0..fcbc540f0 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.pam b/ubuntu/_base/kdebase/debian/kdm-trinity.pam
index 444884767..444884767 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.pam
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.pam
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst b/ubuntu/_base/kdebase/debian/kdm-trinity.postinst
index 0c9b05b4a..0c9b05b4a 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.postinst
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.postrm b/ubuntu/_base/kdebase/debian/kdm-trinity.postrm
index b5719fadd..b5719fadd 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.postrm
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.postrm
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.preinst b/ubuntu/_base/kdebase/debian/kdm-trinity.preinst
index 0e6a2f68b..0e6a2f68b 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.preinst
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.preinst
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.prerm b/ubuntu/_base/kdebase/debian/kdm-trinity.prerm
index 640da5602..640da5602 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.prerm
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.prerm
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.templates b/ubuntu/_base/kdebase/debian/kdm-trinity.templates
index 8c8e3866e..8c8e3866e 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.templates
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.templates
diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.txt b/ubuntu/_base/kdebase/debian/kdm-trinity.txt
index effad2fd6..effad2fd6 100644
--- a/ubuntu/maverick/kdebase/debian/kdm-trinity.txt
+++ b/ubuntu/_base/kdebase/debian/kdm-trinity.txt
diff --git a/ubuntu/maverick/kdebase/debian/kfind-trinity.install b/ubuntu/_base/kdebase/debian/kfind-trinity.install
index 88df3e87f..88df3e87f 100644
--- a/ubuntu/maverick/kdebase/debian/kfind-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kfind-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kfind-trinity.manpages b/ubuntu/_base/kdebase/debian/kfind-trinity.manpages
index f0e6d9c78..f0e6d9c78 100644
--- a/ubuntu/maverick/kdebase/debian/kfind-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kfind-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kfind-trinity.menu b/ubuntu/_base/kdebase/debian/kfind-trinity.menu
index 8763f0a87..8763f0a87 100644
--- a/ubuntu/maverick/kdebase/debian/kfind-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kfind-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kfind-trinity.postinst b/ubuntu/_base/kdebase/debian/kfind-trinity.postinst
index 1020c703e..1020c703e 100644
--- a/ubuntu/maverick/kdebase/debian/kfind-trinity.postinst
+++ b/ubuntu/_base/kdebase/debian/kfind-trinity.postinst
diff --git a/ubuntu/maverick/kdebase/debian/khelpcenter-trinity.install b/ubuntu/_base/kdebase/debian/khelpcenter-trinity.install
index a6d9eb374..a6d9eb374 100644
--- a/ubuntu/maverick/kdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/_base/kdebase/debian/khelpcenter-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/khelpcenter-trinity.lintian b/ubuntu/_base/kdebase/debian/khelpcenter-trinity.lintian
index 181e28c79..181e28c79 100644
--- a/ubuntu/maverick/kdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/khelpcenter-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/khelpcenter-trinity.menu b/ubuntu/_base/kdebase/debian/khelpcenter-trinity.menu
index 5b1822b93..5b1822b93 100644
--- a/ubuntu/maverick/kdebase/debian/khelpcenter-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/khelpcenter-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kicker-trinity.install b/ubuntu/_base/kdebase/debian/kicker-trinity.install
index 7ac93640e..7ac93640e 100644
--- a/ubuntu/maverick/kdebase/debian/kicker-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kicker-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kicker-trinity.lintian b/ubuntu/_base/kdebase/debian/kicker-trinity.lintian
index 58291ed21..58291ed21 100644
--- a/ubuntu/maverick/kdebase/debian/kicker-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/kicker-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/kicker-trinity.manpages b/ubuntu/_base/kdebase/debian/kicker-trinity.manpages
index 399a3843c..399a3843c 100644
--- a/ubuntu/maverick/kdebase/debian/kicker-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kicker-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kicker-trinity.menu b/ubuntu/_base/kdebase/debian/kicker-trinity.menu
index d945d3a4d..d945d3a4d 100644
--- a/ubuntu/maverick/kdebase/debian/kicker-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kicker-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kicker-trinity.preinst b/ubuntu/_base/kdebase/debian/kicker-trinity.preinst
index 12c94f171..12c94f171 100644
--- a/ubuntu/maverick/kdebase/debian/kicker-trinity.preinst
+++ b/ubuntu/_base/kdebase/debian/kicker-trinity.preinst
diff --git a/ubuntu/maverick/kdebase/debian/klipper-trinity.install b/ubuntu/_base/kdebase/debian/klipper-trinity.install
index c866c11a0..c866c11a0 100644
--- a/ubuntu/maverick/kdebase/debian/klipper-trinity.install
+++ b/ubuntu/_base/kdebase/debian/klipper-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/klipper-trinity.lintian b/ubuntu/_base/kdebase/debian/klipper-trinity.lintian
index 320ae2d31..320ae2d31 100644
--- a/ubuntu/maverick/kdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/klipper-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/klipper-trinity.menu b/ubuntu/_base/kdebase/debian/klipper-trinity.menu
index c7992a9b4..c7992a9b4 100644
--- a/ubuntu/maverick/kdebase/debian/klipper-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/klipper-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.install b/ubuntu/_base/kdebase/debian/kmenuedit-trinity.install
index 6b816a21f..6b816a21f 100644
--- a/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kmenuedit-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.lintian b/ubuntu/_base/kdebase/debian/kmenuedit-trinity.lintian
index 845065f6f..845065f6f 100644
--- a/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/kmenuedit-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.manpages b/ubuntu/_base/kdebase/debian/kmenuedit-trinity.manpages
index e657bdffb..e657bdffb 100644
--- a/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kmenuedit-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.menu b/ubuntu/_base/kdebase/debian/kmenuedit-trinity.menu
index 370349760..370349760 100644
--- a/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kmenuedit-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-nsplugins-trinity.install b/ubuntu/_base/kdebase/debian/konqueror-nsplugins-trinity.install
index 9064613b0..9064613b0 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-nsplugins-trinity.install
+++ b/ubuntu/_base/kdebase/debian/konqueror-nsplugins-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.docs b/ubuntu/_base/kdebase/debian/konqueror-trinity.docs
index c023d564b..c023d564b 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.docs
+++ b/ubuntu/_base/kdebase/debian/konqueror-trinity.docs
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.install b/ubuntu/_base/kdebase/debian/konqueror-trinity.install
index 683cf364e..683cf364e 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.install
+++ b/ubuntu/_base/kdebase/debian/konqueror-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.lintian b/ubuntu/_base/kdebase/debian/konqueror-trinity.lintian
index 2bbd4c186..2bbd4c186 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/konqueror-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.manpages b/ubuntu/_base/kdebase/debian/konqueror-trinity.manpages
index 8097ed067..8097ed067 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/konqueror-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.menu b/ubuntu/_base/kdebase/debian/konqueror-trinity.menu
index 6c829efaf..6c829efaf 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/konqueror-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.mime b/ubuntu/_base/kdebase/debian/konqueror-trinity.mime
index 40bfba7c7..40bfba7c7 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.mime
+++ b/ubuntu/_base/kdebase/debian/konqueror-trinity.mime
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.postinst b/ubuntu/_base/kdebase/debian/konqueror-trinity.postinst
index ea83963d9..ea83963d9 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.postinst
+++ b/ubuntu/_base/kdebase/debian/konqueror-trinity.postinst
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.prerm b/ubuntu/_base/kdebase/debian/konqueror-trinity.prerm
index 73baa81cc..73baa81cc 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.prerm
+++ b/ubuntu/_base/kdebase/debian/konqueror-trinity.prerm
diff --git a/ubuntu/maverick/kdebase/debian/konqueror-trinity.presubj b/ubuntu/_base/kdebase/debian/konqueror-trinity.presubj
index c82cdcb71..c82cdcb71 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.presubj
+++ b/ubuntu/_base/kdebase/debian/konqueror-trinity.presubj
diff --git a/ubuntu/maverick/kdebase/debian/konsole-trinity.README.Debian b/ubuntu/_base/kdebase/debian/konsole-trinity.README.Debian
index 82205cf2c..82205cf2c 100644
--- a/ubuntu/maverick/kdebase/debian/konsole-trinity.README.Debian
+++ b/ubuntu/_base/kdebase/debian/konsole-trinity.README.Debian
diff --git a/ubuntu/maverick/kdebase/debian/konsole-trinity.install b/ubuntu/_base/kdebase/debian/konsole-trinity.install
index 9cb0e6878..9cb0e6878 100644
--- a/ubuntu/maverick/kdebase/debian/konsole-trinity.install
+++ b/ubuntu/_base/kdebase/debian/konsole-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/konsole-trinity.lintian b/ubuntu/_base/kdebase/debian/konsole-trinity.lintian
index c050f8ca0..c050f8ca0 100644
--- a/ubuntu/maverick/kdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/konsole-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/konsole-trinity.manpages b/ubuntu/_base/kdebase/debian/konsole-trinity.manpages
index 8c33f637e..8c33f637e 100644
--- a/ubuntu/maverick/kdebase/debian/konsole-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/konsole-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/konsole-trinity.menu b/ubuntu/_base/kdebase/debian/konsole-trinity.menu
index 2439a78a2..2439a78a2 100644
--- a/ubuntu/maverick/kdebase/debian/konsole-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/konsole-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/konsole-trinity.postinst b/ubuntu/_base/kdebase/debian/konsole-trinity.postinst
index 72cf40e83..72cf40e83 100644
--- a/ubuntu/maverick/kdebase/debian/konsole-trinity.postinst
+++ b/ubuntu/_base/kdebase/debian/konsole-trinity.postinst
diff --git a/ubuntu/maverick/kdebase/debian/konsole-trinity.preinst b/ubuntu/_base/kdebase/debian/konsole-trinity.preinst
index 4b167a51e..4b167a51e 100644
--- a/ubuntu/maverick/kdebase/debian/konsole-trinity.preinst
+++ b/ubuntu/_base/kdebase/debian/konsole-trinity.preinst
diff --git a/ubuntu/maverick/kdebase/debian/konsole-trinity.prerm b/ubuntu/_base/kdebase/debian/konsole-trinity.prerm
index 08074f5f3..08074f5f3 100644
--- a/ubuntu/maverick/kdebase/debian/konsole-trinity.prerm
+++ b/ubuntu/_base/kdebase/debian/konsole-trinity.prerm
diff --git a/ubuntu/maverick/kdebase/debian/kpager-trinity.install b/ubuntu/_base/kdebase/debian/kpager-trinity.install
index d9a0bb1ce..d9a0bb1ce 100644
--- a/ubuntu/maverick/kdebase/debian/kpager-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kpager-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kpager-trinity.manpages b/ubuntu/_base/kdebase/debian/kpager-trinity.manpages
index b34d67959..b34d67959 100644
--- a/ubuntu/maverick/kdebase/debian/kpager-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kpager-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kpager-trinity.menu b/ubuntu/_base/kdebase/debian/kpager-trinity.menu
index 15e3c298e..15e3c298e 100644
--- a/ubuntu/maverick/kdebase/debian/kpager-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kpager-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kpersonalizer-trinity.install b/ubuntu/_base/kdebase/debian/kpersonalizer-trinity.install
index 2a710a674..2a710a674 100644
--- a/ubuntu/maverick/kdebase/debian/kpersonalizer-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kpersonalizer-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kpersonalizer-trinity.manpages b/ubuntu/_base/kdebase/debian/kpersonalizer-trinity.manpages
index bcd309b73..bcd309b73 100644
--- a/ubuntu/maverick/kdebase/debian/kpersonalizer-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/kpersonalizer-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/kpersonalizer-trinity.menu b/ubuntu/_base/kdebase/debian/kpersonalizer-trinity.menu
index fe93901c6..fe93901c6 100644
--- a/ubuntu/maverick/kdebase/debian/kpersonalizer-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/kpersonalizer-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kscreensaver-trinity.pam b/ubuntu/_base/kdebase/debian/kscreensaver-trinity.pam
index 088a00503..088a00503 100644
--- a/ubuntu/maverick/kdebase/debian/kscreensaver-trinity.pam
+++ b/ubuntu/_base/kdebase/debian/kscreensaver-trinity.pam
diff --git a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.install b/ubuntu/_base/kdebase/debian/ksmserver-trinity.install
index f5200691f..f5200691f 100644
--- a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.install
+++ b/ubuntu/_base/kdebase/debian/ksmserver-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.lintian b/ubuntu/_base/kdebase/debian/ksmserver-trinity.lintian
index b246da092..b246da092 100644
--- a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/ksmserver-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.manpages b/ubuntu/_base/kdebase/debian/ksmserver-trinity.manpages
index 05b93960e..05b93960e 100644
--- a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.manpages
+++ b/ubuntu/_base/kdebase/debian/ksmserver-trinity.manpages
diff --git a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.postinst b/ubuntu/_base/kdebase/debian/ksmserver-trinity.postinst
index 6492cbb59..6492cbb59 100644
--- a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.postinst
+++ b/ubuntu/_base/kdebase/debian/ksmserver-trinity.postinst
diff --git a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.postrm b/ubuntu/_base/kdebase/debian/ksmserver-trinity.postrm
index 424143ebe..424143ebe 100644
--- a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.postrm
+++ b/ubuntu/_base/kdebase/debian/ksmserver-trinity.postrm
diff --git a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.preinst b/ubuntu/_base/kdebase/debian/ksmserver-trinity.preinst
index fa106bafc..fa106bafc 100644
--- a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.preinst
+++ b/ubuntu/_base/kdebase/debian/ksmserver-trinity.preinst
diff --git a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.prerm b/ubuntu/_base/kdebase/debian/ksmserver-trinity.prerm
index cfe57810f..cfe57810f 100644
--- a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.prerm
+++ b/ubuntu/_base/kdebase/debian/ksmserver-trinity.prerm
diff --git a/ubuntu/maverick/kdebase/debian/ksplash-trinity.install b/ubuntu/_base/kdebase/debian/ksplash-trinity.install
index 847b02505..847b02505 100644
--- a/ubuntu/maverick/kdebase/debian/ksplash-trinity.install
+++ b/ubuntu/_base/kdebase/debian/ksplash-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/ksysguard-trinity.install b/ubuntu/_base/kdebase/debian/ksysguard-trinity.install
index 54649197d..54649197d 100644
--- a/ubuntu/maverick/kdebase/debian/ksysguard-trinity.install
+++ b/ubuntu/_base/kdebase/debian/ksysguard-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/ksysguard-trinity.menu b/ubuntu/_base/kdebase/debian/ksysguard-trinity.menu
index 811fdfbeb..811fdfbeb 100644
--- a/ubuntu/maverick/kdebase/debian/ksysguard-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/ksysguard-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/ksysguardd-trinity.install b/ubuntu/_base/kdebase/debian/ksysguardd-trinity.install
index 644c78911..644c78911 100644
--- a/ubuntu/maverick/kdebase/debian/ksysguardd-trinity.install
+++ b/ubuntu/_base/kdebase/debian/ksysguardd-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/ktip-trinity.install b/ubuntu/_base/kdebase/debian/ktip-trinity.install
index c1aa2e4b8..c1aa2e4b8 100644
--- a/ubuntu/maverick/kdebase/debian/ktip-trinity.install
+++ b/ubuntu/_base/kdebase/debian/ktip-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/ktip-trinity.menu b/ubuntu/_base/kdebase/debian/ktip-trinity.menu
index 0e2f320c5..0e2f320c5 100644
--- a/ubuntu/maverick/kdebase/debian/ktip-trinity.menu
+++ b/ubuntu/_base/kdebase/debian/ktip-trinity.menu
diff --git a/ubuntu/maverick/kdebase/debian/kwin-trinity.install b/ubuntu/_base/kdebase/debian/kwin-trinity.install
index 32b3fe34e..32b3fe34e 100644
--- a/ubuntu/maverick/kdebase/debian/kwin-trinity.install
+++ b/ubuntu/_base/kdebase/debian/kwin-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/kwin-trinity.lintian b/ubuntu/_base/kdebase/debian/kwin-trinity.lintian
index 12758aa76..12758aa76 100644
--- a/ubuntu/maverick/kdebase/debian/kwin-trinity.lintian
+++ b/ubuntu/_base/kdebase/debian/kwin-trinity.lintian
diff --git a/ubuntu/maverick/kdebase/debian/kwin-trinity.postinst b/ubuntu/_base/kdebase/debian/kwin-trinity.postinst
index 4c2228326..4c2228326 100644
--- a/ubuntu/maverick/kdebase/debian/kwin-trinity.postinst
+++ b/ubuntu/_base/kdebase/debian/kwin-trinity.postinst
diff --git a/ubuntu/maverick/kdebase/debian/kwin-trinity.prerm b/ubuntu/_base/kdebase/debian/kwin-trinity.prerm
index fef049114..fef049114 100644
--- a/ubuntu/maverick/kdebase/debian/kwin-trinity.prerm
+++ b/ubuntu/_base/kdebase/debian/kwin-trinity.prerm
diff --git a/ubuntu/maverick/kdebase/debian/libkonq4-trinity-dev.install b/ubuntu/_base/kdebase/debian/libkonq4-trinity-dev.install
index 7eb2c120e..7eb2c120e 100644
--- a/ubuntu/maverick/kdebase/debian/libkonq4-trinity-dev.install
+++ b/ubuntu/_base/kdebase/debian/libkonq4-trinity-dev.install
diff --git a/ubuntu/maverick/kdebase/debian/libkonq4-trinity.docs b/ubuntu/_base/kdebase/debian/libkonq4-trinity.docs
index c023d564b..c023d564b 100644
--- a/ubuntu/maverick/kdebase/debian/libkonq4-trinity.docs
+++ b/ubuntu/_base/kdebase/debian/libkonq4-trinity.docs
diff --git a/ubuntu/maverick/kdebase/debian/libkonq4-trinity.install b/ubuntu/_base/kdebase/debian/libkonq4-trinity.install
index 77ea07f1a..77ea07f1a 100644
--- a/ubuntu/maverick/kdebase/debian/libkonq4-trinity.install
+++ b/ubuntu/_base/kdebase/debian/libkonq4-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/libtqt3-integration-trinity.install b/ubuntu/_base/kdebase/debian/libtqt3-integration-trinity.install
index 9f747bbda..9f747bbda 100644
--- a/ubuntu/maverick/kdebase/debian/libtqt3-integration-trinity.install
+++ b/ubuntu/_base/kdebase/debian/libtqt3-integration-trinity.install
diff --git a/ubuntu/maverick/kdebase/debian/local/kdm.options b/ubuntu/_base/kdebase/debian/local/kdm.options
index 61e4c04a0..61e4c04a0 100644
--- a/ubuntu/maverick/kdebase/debian/local/kdm.options
+++ b/ubuntu/_base/kdebase/debian/local/kdm.options
diff --git a/ubuntu/maverick/kdebase/debian/local/kdm.options.5 b/ubuntu/_base/kdebase/debian/local/kdm.options.5
index e1ccaef2f..e1ccaef2f 100644
--- a/ubuntu/maverick/kdebase/debian/local/kdm.options.5
+++ b/ubuntu/_base/kdebase/debian/local/kdm.options.5
diff --git a/ubuntu/maverick/kdebase/debian/man/appletproxy-trinity.1 b/ubuntu/_base/kdebase/debian/man/appletproxy-trinity.1
index 38a96a27d..38a96a27d 100644
--- a/ubuntu/maverick/kdebase/debian/man/appletproxy-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/appletproxy-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/drkonqi-trinity.1 b/ubuntu/_base/kdebase/debian/man/drkonqi-trinity.1
index c1a7a8936..c1a7a8936 100644
--- a/ubuntu/maverick/kdebase/debian/man/drkonqi-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/drkonqi-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/extensionproxy-trinity.1 b/ubuntu/_base/kdebase/debian/man/extensionproxy-trinity.1
index 36f343ed0..36f343ed0 100644
--- a/ubuntu/maverick/kdebase/debian/man/extensionproxy-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/extensionproxy-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/genkdmconf-trinity.1 b/ubuntu/_base/kdebase/debian/man/genkdmconf-trinity.1
index e23122b89..e23122b89 100644
--- a/ubuntu/maverick/kdebase/debian/man/genkdmconf-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/genkdmconf-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kappfinder-trinity.1 b/ubuntu/_base/kdebase/debian/man/kappfinder-trinity.1
index c7ca7507c..c7ca7507c 100644
--- a/ubuntu/maverick/kdebase/debian/man/kappfinder-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kappfinder-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kasbar-trinity.1 b/ubuntu/_base/kdebase/debian/man/kasbar-trinity.1
index f7b07efef..f7b07efef 100644
--- a/ubuntu/maverick/kdebase/debian/man/kasbar-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kasbar-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kate-trinity.1 b/ubuntu/_base/kdebase/debian/man/kate-trinity.1
index 7f9b54d87..7f9b54d87 100644
--- a/ubuntu/maverick/kdebase/debian/man/kate-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kate-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kblankscrn.kss-trinity.1 b/ubuntu/_base/kdebase/debian/man/kblankscrn.kss-trinity.1
index 473befef9..473befef9 100644
--- a/ubuntu/maverick/kdebase/debian/man/kblankscrn.kss-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kblankscrn.kss-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kcheckpass-trinity.1 b/ubuntu/_base/kdebase/debian/man/kcheckpass-trinity.1
index 113074e29..113074e29 100644
--- a/ubuntu/maverick/kdebase/debian/man/kcheckpass-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kcheckpass-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kcminit-trinity.1 b/ubuntu/_base/kdebase/debian/man/kcminit-trinity.1
index 86e4db1a4..86e4db1a4 100644
--- a/ubuntu/maverick/kdebase/debian/man/kcminit-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kcminit-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdcop-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdcop-trinity.1
index 02425c769..02425c769 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdcop-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdcop-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdebugdialog-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdebugdialog-trinity.1
index b3b7327cf..b3b7327cf 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdebugdialog-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdebugdialog-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdepasswd-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdepasswd-trinity.1
index 44a4128cc..44a4128cc 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdepasswd-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdepasswd-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdeprintfax-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdeprintfax-trinity.1
index 0308ac1d8..0308ac1d8 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdeprintfax-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdeprintfax-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdesu-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdesu-trinity.1
index e552d288c..e552d288c 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdesu-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdesu-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdialog-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdialog-trinity.1
index fc4ccccb1..fc4ccccb1 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdialog-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdialog-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdm-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdm-trinity.1
index e6c7a0b19..e6c7a0b19 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdm-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdm-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdm_config-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdm_config-trinity.1
index d1cbfea1d..d1cbfea1d 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdm_config-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdm_config-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdm_greet-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdm_greet-trinity.1
index f1607e2b1..f1607e2b1 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdm_greet-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdm_greet-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kdmctl-trinity.1 b/ubuntu/_base/kdebase/debian/man/kdmctl-trinity.1
index b05f09407..b05f09407 100644
--- a/ubuntu/maverick/kdebase/debian/man/kdmctl-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kdmctl-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/keditbookmarks-trinity.1 b/ubuntu/_base/kdebase/debian/man/keditbookmarks-trinity.1
index c9562fe1d..c9562fe1d 100644
--- a/ubuntu/maverick/kdebase/debian/man/keditbookmarks-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/keditbookmarks-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kfind-trinity.1 b/ubuntu/_base/kdebase/debian/man/kfind-trinity.1
index 4eee62075..4eee62075 100644
--- a/ubuntu/maverick/kdebase/debian/man/kfind-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kfind-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kfmclient-trinity.1 b/ubuntu/_base/kdebase/debian/man/kfmclient-trinity.1
index 193204778..193204778 100644
--- a/ubuntu/maverick/kdebase/debian/man/kfmclient-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kfmclient-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/khotkeys-trinity.1 b/ubuntu/_base/kdebase/debian/man/khotkeys-trinity.1
index 5f6f3ffbc..5f6f3ffbc 100644
--- a/ubuntu/maverick/kdebase/debian/man/khotkeys-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/khotkeys-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kicker-trinity.1 b/ubuntu/_base/kdebase/debian/man/kicker-trinity.1
index cc48aa37d..cc48aa37d 100644
--- a/ubuntu/maverick/kdebase/debian/man/kicker-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kicker-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kio_media_mounthelper-trinity.1 b/ubuntu/_base/kdebase/debian/man/kio_media_mounthelper-trinity.1
index 1a6fd6971..1a6fd6971 100644
--- a/ubuntu/maverick/kdebase/debian/man/kio_media_mounthelper-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kio_media_mounthelper-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kio_system_documenthelper-trinity.1 b/ubuntu/_base/kdebase/debian/man/kio_system_documenthelper-trinity.1
index 9779578e6..9779578e6 100644
--- a/ubuntu/maverick/kdebase/debian/man/kio_system_documenthelper-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kio_system_documenthelper-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kjobviewer-trinity.1 b/ubuntu/_base/kdebase/debian/man/kjobviewer-trinity.1
index 767d4ab1f..767d4ab1f 100644
--- a/ubuntu/maverick/kdebase/debian/man/kjobviewer-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kjobviewer-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kmenuedit-trinity.1 b/ubuntu/_base/kdebase/debian/man/kmenuedit-trinity.1
index 7f861654a..7f861654a 100644
--- a/ubuntu/maverick/kdebase/debian/man/kmenuedit-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kmenuedit-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/knetattach-trinity.1 b/ubuntu/_base/kdebase/debian/man/knetattach-trinity.1
index 53eb047d7..53eb047d7 100644
--- a/ubuntu/maverick/kdebase/debian/man/knetattach-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/knetattach-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/konqueror-trinity.1 b/ubuntu/_base/kdebase/debian/man/konqueror-trinity.1
index d0525d008..d0525d008 100644
--- a/ubuntu/maverick/kdebase/debian/man/konqueror-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/konqueror-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/konsole-trinity.1 b/ubuntu/_base/kdebase/debian/man/konsole-trinity.1
index 5b779fda3..5b779fda3 100644
--- a/ubuntu/maverick/kdebase/debian/man/konsole-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/konsole-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kpager-trinity.1 b/ubuntu/_base/kdebase/debian/man/kpager-trinity.1
index d704d611a..d704d611a 100644
--- a/ubuntu/maverick/kdebase/debian/man/kpager-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kpager-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kpersonalizer-trinity.1 b/ubuntu/_base/kdebase/debian/man/kpersonalizer-trinity.1
index 311d3c4fe..311d3c4fe 100644
--- a/ubuntu/maverick/kdebase/debian/man/kpersonalizer-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kpersonalizer-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kprinter-trinity.1 b/ubuntu/_base/kdebase/debian/man/kprinter-trinity.1
index 340bd84d1..340bd84d1 100644
--- a/ubuntu/maverick/kdebase/debian/man/kprinter-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kprinter-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/krandom.kss-trinity.1 b/ubuntu/_base/kdebase/debian/man/krandom.kss-trinity.1
index e2aa1a141..e2aa1a141 100644
--- a/ubuntu/maverick/kdebase/debian/man/krandom.kss-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/krandom.kss-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kreadconfig-trinity.1 b/ubuntu/_base/kdebase/debian/man/kreadconfig-trinity.1
index 5bd6f869c..5bd6f869c 100644
--- a/ubuntu/maverick/kdebase/debian/man/kreadconfig-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kreadconfig-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/krootimage-trinity.1 b/ubuntu/_base/kdebase/debian/man/krootimage-trinity.1
index 2b683c19e..2b683c19e 100644
--- a/ubuntu/maverick/kdebase/debian/man/krootimage-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/krootimage-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kstart-trinity.1 b/ubuntu/_base/kdebase/debian/man/kstart-trinity.1
index 189e6b2b2..189e6b2b2 100644
--- a/ubuntu/maverick/kdebase/debian/man/kstart-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kstart-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/ksystraycmd-trinity.1 b/ubuntu/_base/kdebase/debian/man/ksystraycmd-trinity.1
index 73ba046e5..73ba046e5 100644
--- a/ubuntu/maverick/kdebase/debian/man/ksystraycmd-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/ksystraycmd-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/ktrash-trinity.1 b/ubuntu/_base/kdebase/debian/man/ktrash-trinity.1
index 06a844a8b..06a844a8b 100644
--- a/ubuntu/maverick/kdebase/debian/man/ktrash-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/ktrash-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kwrite-trinity.1 b/ubuntu/_base/kdebase/debian/man/kwrite-trinity.1
index 93c713176..93c713176 100644
--- a/ubuntu/maverick/kdebase/debian/man/kwrite-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kwrite-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kwriteconfig-trinity.1 b/ubuntu/_base/kdebase/debian/man/kwriteconfig-trinity.1
index c98ebd1d4..c98ebd1d4 100644
--- a/ubuntu/maverick/kdebase/debian/man/kwriteconfig-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kwriteconfig-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/kxkb-trinity.1 b/ubuntu/_base/kdebase/debian/man/kxkb-trinity.1
index 38a1a2a08..38a1a2a08 100644
--- a/ubuntu/maverick/kdebase/debian/man/kxkb-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/kxkb-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/man/startkde-trinity.1 b/ubuntu/_base/kdebase/debian/man/startkde-trinity.1
index f26b7f128..f26b7f128 100644
--- a/ubuntu/maverick/kdebase/debian/man/startkde-trinity.1
+++ b/ubuntu/_base/kdebase/debian/man/startkde-trinity.1
diff --git a/ubuntu/maverick/kdebase/debian/not-installed.list b/ubuntu/_base/kdebase/debian/not-installed.list
index 75f0d641a..75f0d641a 100644
--- a/ubuntu/maverick/kdebase/debian/not-installed.list
+++ b/ubuntu/_base/kdebase/debian/not-installed.list
diff --git a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/_base/kdebase/debian/patches/disable_default_kdm_theme.diff
index a6859c81f..a6859c81f 100644
--- a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff
+++ b/ubuntu/_base/kdebase/debian/patches/disable_default_kdm_theme.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff b/ubuntu/_base/kdebase/debian/patches/disable_startkde_wallpaper.diff
index f78ecf14e..f78ecf14e 100644
--- a/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/ubuntu/_base/kdebase/debian/patches/disable_startkde_wallpaper.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
index 5fca9c324..5fca9c324 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_04_hide_menu_entries.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
index b9fe3609a..b9fe3609a 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_06_hide_home_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
index 6768121dd..6768121dd 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
index d5e944949..d5e944949 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_08_hide_kcmkicker_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
index 0bba8642d..0bba8642d 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
index 317ad4913..317ad4913 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_10_hide_kmenuedit_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
index 08a6c5675..08a6c5675 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_11_hide_kappfinder_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
index a82001d03..a82001d03 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_13_hide_konsolesu_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
index 1559f0f95..1559f0f95 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
index cce526122..cce526122 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_15_hide_kfontview_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
index 53f517879..53f517879 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
index 5b28ee4df..5b28ee4df 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_35_hide_klipper_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
index c572317c0..c572317c0 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_48_hide_display.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_48_hide_display.diff
index 2de447630..2de447630 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_48_hide_display.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_48_hide_display.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
index 88081e51e..88081e51e 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_70_hide_printers_desktop.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
index 8fc8abb28..8fc8abb28 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_78_kcontrol_hide_component_chooser.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff
index b17107a66..b17107a66 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_89_new_logout_ui.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_9904_hide_kfind.diff
index 72ecfb55f..72ecfb55f 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_9904_hide_kfind.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_9904_hide_kfind.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff b/ubuntu/_base/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff
index 4aad9f8e3..4aad9f8e3 100644
--- a/ubuntu/maverick/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff
+++ b/ubuntu/_base/kdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff
diff --git a/ubuntu/maverick/kdebase/debian/patches/series b/ubuntu/_base/kdebase/debian/patches/series
index ee37e515b..ee37e515b 100644
--- a/ubuntu/maverick/kdebase/debian/patches/series
+++ b/ubuntu/_base/kdebase/debian/patches/series
diff --git a/ubuntu/maverick/kdebase/debian/plasma-desktop.autodetect b/ubuntu/_base/kdebase/debian/plasma-desktop.autodetect
index b083cb277..b083cb277 100755
--- a/ubuntu/maverick/kdebase/debian/plasma-desktop.autodetect
+++ b/ubuntu/_base/kdebase/debian/plasma-desktop.autodetect
diff --git a/ubuntu/maverick/kdebase/debian/plasma.autodetect b/ubuntu/_base/kdebase/debian/plasma.autodetect
index c23f68909..c23f68909 100755
--- a/ubuntu/maverick/kdebase/debian/plasma.autodetect
+++ b/ubuntu/_base/kdebase/debian/plasma.autodetect
diff --git a/ubuntu/maverick/kdebase/debian/po/POTFILES.in b/ubuntu/_base/kdebase/debian/po/POTFILES.in
index 416e5f394..416e5f394 100644
--- a/ubuntu/maverick/kdebase/debian/po/POTFILES.in
+++ b/ubuntu/_base/kdebase/debian/po/POTFILES.in
diff --git a/ubuntu/maverick/kdebase/debian/po/ar.po b/ubuntu/_base/kdebase/debian/po/ar.po
index 6153b4301..6153b4301 100644
--- a/ubuntu/maverick/kdebase/debian/po/ar.po
+++ b/ubuntu/_base/kdebase/debian/po/ar.po
diff --git a/ubuntu/maverick/kdebase/debian/po/ca.po b/ubuntu/_base/kdebase/debian/po/ca.po
index 8115f5910..8115f5910 100644
--- a/ubuntu/maverick/kdebase/debian/po/ca.po
+++ b/ubuntu/_base/kdebase/debian/po/ca.po
diff --git a/ubuntu/maverick/kdebase/debian/po/cs.po b/ubuntu/_base/kdebase/debian/po/cs.po
index cf3406f97..cf3406f97 100644
--- a/ubuntu/maverick/kdebase/debian/po/cs.po
+++ b/ubuntu/_base/kdebase/debian/po/cs.po
diff --git a/ubuntu/maverick/kdebase/debian/po/da.po b/ubuntu/_base/kdebase/debian/po/da.po
index 3cf989ee0..3cf989ee0 100644
--- a/ubuntu/maverick/kdebase/debian/po/da.po
+++ b/ubuntu/_base/kdebase/debian/po/da.po
diff --git a/ubuntu/maverick/kdebase/debian/po/de.po b/ubuntu/_base/kdebase/debian/po/de.po
index 71630e59d..71630e59d 100644
--- a/ubuntu/maverick/kdebase/debian/po/de.po
+++ b/ubuntu/_base/kdebase/debian/po/de.po
diff --git a/ubuntu/maverick/kdebase/debian/po/el.po b/ubuntu/_base/kdebase/debian/po/el.po
index c4a73a75a..c4a73a75a 100644
--- a/ubuntu/maverick/kdebase/debian/po/el.po
+++ b/ubuntu/_base/kdebase/debian/po/el.po
diff --git a/ubuntu/maverick/kdebase/debian/po/es.po b/ubuntu/_base/kdebase/debian/po/es.po
index 2219af271..2219af271 100644
--- a/ubuntu/maverick/kdebase/debian/po/es.po
+++ b/ubuntu/_base/kdebase/debian/po/es.po
diff --git a/ubuntu/maverick/kdebase/debian/po/eu.po b/ubuntu/_base/kdebase/debian/po/eu.po
index 976ce1556..976ce1556 100644
--- a/ubuntu/maverick/kdebase/debian/po/eu.po
+++ b/ubuntu/_base/kdebase/debian/po/eu.po
diff --git a/ubuntu/maverick/kdebase/debian/po/fi.po b/ubuntu/_base/kdebase/debian/po/fi.po
index 3fbbd16d4..3fbbd16d4 100644
--- a/ubuntu/maverick/kdebase/debian/po/fi.po
+++ b/ubuntu/_base/kdebase/debian/po/fi.po
diff --git a/ubuntu/maverick/kdebase/debian/po/fr.po b/ubuntu/_base/kdebase/debian/po/fr.po
index 764b3dd7d..764b3dd7d 100644
--- a/ubuntu/maverick/kdebase/debian/po/fr.po
+++ b/ubuntu/_base/kdebase/debian/po/fr.po
diff --git a/ubuntu/maverick/kdebase/debian/po/gl.po b/ubuntu/_base/kdebase/debian/po/gl.po
index 896b37aae..896b37aae 100644
--- a/ubuntu/maverick/kdebase/debian/po/gl.po
+++ b/ubuntu/_base/kdebase/debian/po/gl.po
diff --git a/ubuntu/maverick/kdebase/debian/po/it.po b/ubuntu/_base/kdebase/debian/po/it.po
index 420476257..420476257 100644
--- a/ubuntu/maverick/kdebase/debian/po/it.po
+++ b/ubuntu/_base/kdebase/debian/po/it.po
diff --git a/ubuntu/maverick/kdebase/debian/po/ja.po b/ubuntu/_base/kdebase/debian/po/ja.po
index d9f8d9f15..d9f8d9f15 100644
--- a/ubuntu/maverick/kdebase/debian/po/ja.po
+++ b/ubuntu/_base/kdebase/debian/po/ja.po
diff --git a/ubuntu/maverick/kdebase/debian/po/ko.po b/ubuntu/_base/kdebase/debian/po/ko.po
index 6200caa12..6200caa12 100644
--- a/ubuntu/maverick/kdebase/debian/po/ko.po
+++ b/ubuntu/_base/kdebase/debian/po/ko.po
diff --git a/ubuntu/maverick/kdebase/debian/po/ml.po b/ubuntu/_base/kdebase/debian/po/ml.po
index b4b07f9b2..b4b07f9b2 100644
--- a/ubuntu/maverick/kdebase/debian/po/ml.po
+++ b/ubuntu/_base/kdebase/debian/po/ml.po
diff --git a/ubuntu/maverick/kdebase/debian/po/nb.po b/ubuntu/_base/kdebase/debian/po/nb.po
index f770838af..f770838af 100644
--- a/ubuntu/maverick/kdebase/debian/po/nb.po
+++ b/ubuntu/_base/kdebase/debian/po/nb.po
diff --git a/ubuntu/maverick/kdebase/debian/po/nl.po b/ubuntu/_base/kdebase/debian/po/nl.po
index 9d693cc23..9d693cc23 100644
--- a/ubuntu/maverick/kdebase/debian/po/nl.po
+++ b/ubuntu/_base/kdebase/debian/po/nl.po
diff --git a/ubuntu/maverick/kdebase/debian/po/pl.po b/ubuntu/_base/kdebase/debian/po/pl.po
index e2f253da7..e2f253da7 100644
--- a/ubuntu/maverick/kdebase/debian/po/pl.po
+++ b/ubuntu/_base/kdebase/debian/po/pl.po
diff --git a/ubuntu/maverick/kdebase/debian/po/pt.po b/ubuntu/_base/kdebase/debian/po/pt.po
index 9720aa0f0..9720aa0f0 100644
--- a/ubuntu/maverick/kdebase/debian/po/pt.po
+++ b/ubuntu/_base/kdebase/debian/po/pt.po
diff --git a/ubuntu/maverick/kdebase/debian/po/pt_BR.po b/ubuntu/_base/kdebase/debian/po/pt_BR.po
index 8cf324e24..8cf324e24 100644
--- a/ubuntu/maverick/kdebase/debian/po/pt_BR.po
+++ b/ubuntu/_base/kdebase/debian/po/pt_BR.po
diff --git a/ubuntu/maverick/kdebase/debian/po/ro.po b/ubuntu/_base/kdebase/debian/po/ro.po
index 13bc24c72..13bc24c72 100644
--- a/ubuntu/maverick/kdebase/debian/po/ro.po
+++ b/ubuntu/_base/kdebase/debian/po/ro.po
diff --git a/ubuntu/maverick/kdebase/debian/po/ru.po b/ubuntu/_base/kdebase/debian/po/ru.po
index af8d3fb9d..af8d3fb9d 100644
--- a/ubuntu/maverick/kdebase/debian/po/ru.po
+++ b/ubuntu/_base/kdebase/debian/po/ru.po
diff --git a/ubuntu/maverick/kdebase/debian/po/sk.po b/ubuntu/_base/kdebase/debian/po/sk.po
index e7b350961..e7b350961 100644
--- a/ubuntu/maverick/kdebase/debian/po/sk.po
+++ b/ubuntu/_base/kdebase/debian/po/sk.po
diff --git a/ubuntu/maverick/kdebase/debian/po/sv.po b/ubuntu/_base/kdebase/debian/po/sv.po
index 07d0cc914..07d0cc914 100644
--- a/ubuntu/maverick/kdebase/debian/po/sv.po
+++ b/ubuntu/_base/kdebase/debian/po/sv.po
diff --git a/ubuntu/maverick/kdebase/debian/po/ta.po b/ubuntu/_base/kdebase/debian/po/ta.po
index 993ae3933..993ae3933 100644
--- a/ubuntu/maverick/kdebase/debian/po/ta.po
+++ b/ubuntu/_base/kdebase/debian/po/ta.po
diff --git a/ubuntu/maverick/kdebase/debian/po/templates.pot b/ubuntu/_base/kdebase/debian/po/templates.pot
index f8b19923e..f8b19923e 100644
--- a/ubuntu/maverick/kdebase/debian/po/templates.pot
+++ b/ubuntu/_base/kdebase/debian/po/templates.pot
diff --git a/ubuntu/maverick/kdebase/debian/po/tr.po b/ubuntu/_base/kdebase/debian/po/tr.po
index bc0e664d2..bc0e664d2 100644
--- a/ubuntu/maverick/kdebase/debian/po/tr.po
+++ b/ubuntu/_base/kdebase/debian/po/tr.po
diff --git a/ubuntu/maverick/kdebase/debian/po/vi.po b/ubuntu/_base/kdebase/debian/po/vi.po
index 0875e65e8..0875e65e8 100644
--- a/ubuntu/maverick/kdebase/debian/po/vi.po
+++ b/ubuntu/_base/kdebase/debian/po/vi.po
diff --git a/ubuntu/maverick/kdebase/debian/po/zh_CN.po b/ubuntu/_base/kdebase/debian/po/zh_CN.po
index 9d085dde5..9d085dde5 100644
--- a/ubuntu/maverick/kdebase/debian/po/zh_CN.po
+++ b/ubuntu/_base/kdebase/debian/po/zh_CN.po
diff --git a/ubuntu/maverick/kdebase/debian/prune-nonfree b/ubuntu/_base/kdebase/debian/prune-nonfree
index 4fa832d5c..4fa832d5c 100644
--- a/ubuntu/maverick/kdebase/debian/prune-nonfree
+++ b/ubuntu/_base/kdebase/debian/prune-nonfree
diff --git a/ubuntu/maverick/kdebase/debian/rules b/ubuntu/_base/kdebase/debian/rules
index aef6791dc..aef6791dc 100755
--- a/ubuntu/maverick/kdebase/debian/rules
+++ b/ubuntu/_base/kdebase/debian/rules
diff --git a/ubuntu/maverick/kdebase/debian/source.lintian-overrides b/ubuntu/_base/kdebase/debian/source.lintian-overrides
index 1f13dc534..1f13dc534 100644
--- a/ubuntu/maverick/kdebase/debian/source.lintian-overrides
+++ b/ubuntu/_base/kdebase/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/kdebase/debian/source/format b/ubuntu/_base/kdebase/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdebase/debian/source/format
+++ b/ubuntu/_base/kdebase/debian/source/format
diff --git a/ubuntu/maverick/kdebase/debian/source/options b/ubuntu/_base/kdebase/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdebase/debian/source/options
+++ b/ubuntu/_base/kdebase/debian/source/options
diff --git a/ubuntu/maverick/kdebase/debian/ubuntu.xmodmap b/ubuntu/_base/kdebase/debian/ubuntu.xmodmap
index 2dcca54c5..2dcca54c5 100644
--- a/ubuntu/maverick/kdebase/debian/ubuntu.xmodmap
+++ b/ubuntu/_base/kdebase/debian/ubuntu.xmodmap
diff --git a/ubuntu/maverick/kdebase/debian/usermap.pl b/ubuntu/_base/kdebase/debian/usermap.pl
index 9c8c61f26..9c8c61f26 100644
--- a/ubuntu/maverick/kdebase/debian/usermap.pl
+++ b/ubuntu/_base/kdebase/debian/usermap.pl
diff --git a/ubuntu/maverick/kdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 91e47fe4d..91e47fe4d 100644
--- a/ubuntu/maverick/kdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdebindings/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdebindings/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdebindings/debian/cdbs/debian-qt-kde.mk
index 1859f6d8d..1859f6d8d 100644
--- a/ubuntu/maverick/kdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdebindings/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdebindings/debian/cdbs/kde.mk b/ubuntu/_base/kdebindings/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdebindings/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdebindings/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdebindings/debian/cdbs/versions.pl b/ubuntu/_base/kdebindings/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdebindings/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdebindings/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdebindings/debian/changelog b/ubuntu/_base/kdebindings/debian/changelog
index 2379c01a4..2379c01a4 100644
--- a/ubuntu/maverick/kdebindings/debian/changelog
+++ b/ubuntu/_base/kdebindings/debian/changelog
diff --git a/ubuntu/maverick/kdebindings/debian/compat b/ubuntu/_base/kdebindings/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdebindings/debian/compat
+++ b/ubuntu/_base/kdebindings/debian/compat
diff --git a/ubuntu/maverick/kdebindings/debian/control b/ubuntu/_base/kdebindings/debian/control
index 426f5ad8d..426f5ad8d 100644
--- a/ubuntu/maverick/kdebindings/debian/control
+++ b/ubuntu/_base/kdebindings/debian/control
diff --git a/ubuntu/maverick/kdebindings/debian/copyright b/ubuntu/_base/kdebindings/debian/copyright
index 40047d0f9..40047d0f9 100644
--- a/ubuntu/maverick/kdebindings/debian/copyright
+++ b/ubuntu/_base/kdebindings/debian/copyright
diff --git a/ubuntu/maverick/kdebindings/debian/juic-trinity.install b/ubuntu/_base/kdebindings/debian/juic-trinity.install
index b29210f2c..b29210f2c 100644
--- a/ubuntu/maverick/kdebindings/debian/juic-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/juic-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/juic-trinity.manpages b/ubuntu/_base/kdebindings/debian/juic-trinity.manpages
index 3b2609197..3b2609197 100644
--- a/ubuntu/maverick/kdebindings/debian/juic-trinity.manpages
+++ b/ubuntu/_base/kdebindings/debian/juic-trinity.manpages
diff --git a/ubuntu/maverick/kdebindings/debian/kdebindings-java-trinity.links b/ubuntu/_base/kdebindings/debian/kdebindings-java-trinity.links
index eb432f0b9..eb432f0b9 100644
--- a/ubuntu/maverick/kdebindings/debian/kdebindings-java-trinity.links
+++ b/ubuntu/_base/kdebindings/debian/kdebindings-java-trinity.links
diff --git a/ubuntu/maverick/kdebindings/debian/kjscmd-trinity.install b/ubuntu/_base/kdebindings/debian/kjscmd-trinity.install
index e1bbc2e30..e1bbc2e30 100644
--- a/ubuntu/maverick/kdebindings/debian/kjscmd-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/kjscmd-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/kjscmd-trinity.links b/ubuntu/_base/kdebindings/debian/kjscmd-trinity.links
index 2305663ec..2305663ec 100644
--- a/ubuntu/maverick/kdebindings/debian/kjscmd-trinity.links
+++ b/ubuntu/_base/kdebindings/debian/kjscmd-trinity.links
diff --git a/ubuntu/maverick/kdebindings/debian/kjscmd-trinity.menu b/ubuntu/_base/kdebindings/debian/kjscmd-trinity.menu
index 6997d23cb..6997d23cb 100644
--- a/ubuntu/maverick/kdebindings/debian/kjscmd-trinity.menu
+++ b/ubuntu/_base/kdebindings/debian/kjscmd-trinity.menu
diff --git a/ubuntu/maverick/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install b/ubuntu/_base/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install
index e37ad763e..e37ad763e 100644
--- a/ubuntu/maverick/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/konqueror-kjsembed-plugin-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libdcop-perl-trinity.docs b/ubuntu/_base/kdebindings/debian/libdcop-perl-trinity.docs
index 869f451fd..869f451fd 100644
--- a/ubuntu/maverick/kdebindings/debian/libdcop-perl-trinity.docs
+++ b/ubuntu/_base/kdebindings/debian/libdcop-perl-trinity.docs
diff --git a/ubuntu/maverick/kdebindings/debian/libdcop-perl-trinity.install b/ubuntu/_base/kdebindings/debian/libdcop-perl-trinity.install
index b01687bab..b01687bab 100644
--- a/ubuntu/maverick/kdebindings/debian/libdcop-perl-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libdcop-perl-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity-dev.install b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity-dev.install
index c1fa59ac4..c1fa59ac4 100644
--- a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity-dev.install
+++ b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity-dev.install
diff --git a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity-dev.links b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity-dev.links
index ad842107e..ad842107e 100644
--- a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity-dev.links
+++ b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity-dev.links
diff --git a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity-dev.manpages b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity-dev.manpages
index 74e63033b..74e63033b 100644
--- a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity-dev.manpages
+++ b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity-dev.manpages
diff --git a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity.install b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity.install
index 024aecc38..024aecc38 100644
--- a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity.links b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity.links
index 15127ed24..15127ed24 100644
--- a/ubuntu/maverick/kdebindings/debian/libdcop3-java-trinity.links
+++ b/ubuntu/_base/kdebindings/debian/libdcop3-java-trinity.links
diff --git a/ubuntu/maverick/kdebindings/debian/libdcop3-jni-trinity.install b/ubuntu/_base/kdebindings/debian/libdcop3-jni-trinity.install
index 99f72f148..99f72f148 100644
--- a/ubuntu/maverick/kdebindings/debian/libdcop3-jni-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libdcop3-jni-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libkjsembed-trinity-dev.dirs b/ubuntu/_base/kdebindings/debian/libkjsembed-trinity-dev.dirs
index f9e762e38..f9e762e38 100644
--- a/ubuntu/maverick/kdebindings/debian/libkjsembed-trinity-dev.dirs
+++ b/ubuntu/_base/kdebindings/debian/libkjsembed-trinity-dev.dirs
diff --git a/ubuntu/maverick/kdebindings/debian/libkjsembed-trinity-dev.docs b/ubuntu/_base/kdebindings/debian/libkjsembed-trinity-dev.docs
index bd723f85c..bd723f85c 100644
--- a/ubuntu/maverick/kdebindings/debian/libkjsembed-trinity-dev.docs
+++ b/ubuntu/_base/kdebindings/debian/libkjsembed-trinity-dev.docs
diff --git a/ubuntu/maverick/kdebindings/debian/libkjsembed-trinity-dev.install b/ubuntu/_base/kdebindings/debian/libkjsembed-trinity-dev.install
index 62a36de6e..62a36de6e 100644
--- a/ubuntu/maverick/kdebindings/debian/libkjsembed-trinity-dev.install
+++ b/ubuntu/_base/kdebindings/debian/libkjsembed-trinity-dev.install
diff --git a/ubuntu/maverick/kdebindings/debian/libkjsembed-trinity-dev.links b/ubuntu/_base/kdebindings/debian/libkjsembed-trinity-dev.links
index a9e53e9a4..a9e53e9a4 100644
--- a/ubuntu/maverick/kdebindings/debian/libkjsembed-trinity-dev.links
+++ b/ubuntu/_base/kdebindings/debian/libkjsembed-trinity-dev.links
diff --git a/ubuntu/maverick/kdebindings/debian/libkjsembed1-trinity.docs b/ubuntu/_base/kdebindings/debian/libkjsembed1-trinity.docs
index 4c40dd769..4c40dd769 100644
--- a/ubuntu/maverick/kdebindings/debian/libkjsembed1-trinity.docs
+++ b/ubuntu/_base/kdebindings/debian/libkjsembed1-trinity.docs
diff --git a/ubuntu/maverick/kdebindings/debian/libkjsembed1-trinity.install b/ubuntu/_base/kdebindings/debian/libkjsembed1-trinity.install
index c0fe0bc67..c0fe0bc67 100644
--- a/ubuntu/maverick/kdebindings/debian/libkjsembed1-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libkjsembed1-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.docs b/ubuntu/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.docs
index fcf01a118..fcf01a118 100644
--- a/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.docs
+++ b/ubuntu/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.docs
diff --git a/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.install b/ubuntu/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.install
index d34b2b006..d34b2b006 100644
--- a/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.manpages b/ubuntu/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
index 0dcb02444..0dcb02444 100644
--- a/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
+++ b/ubuntu/_base/kdebindings/debian/libkorundum0-ruby1.8-trinity.manpages
diff --git a/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.docs b/ubuntu/_base/kdebindings/debian/libqt0-ruby1.8-trinity.docs
index a6f9fffce..a6f9fffce 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.docs
+++ b/ubuntu/_base/kdebindings/debian/libqt0-ruby1.8-trinity.docs
diff --git a/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/_base/kdebindings/debian/libqt0-ruby1.8-trinity.install
index 91bc7c692..91bc7c692 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libqt0-ruby1.8-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.manpages b/ubuntu/_base/kdebindings/debian/libqt0-ruby1.8-trinity.manpages
index f2dc6de31..f2dc6de31 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.manpages
+++ b/ubuntu/_base/kdebindings/debian/libqt0-ruby1.8-trinity.manpages
diff --git a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.README.Debian b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.README.Debian
index bfba13c88..bfba13c88 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.README.Debian
+++ b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.README.Debian
diff --git a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.dirs b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.dirs
index 9fe145a6d..9fe145a6d 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.dirs
+++ b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.dirs
diff --git a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.docs b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.docs
index b10168041..b10168041 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.docs
+++ b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.docs
diff --git a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.install b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.install
index 0b068bc53..0b068bc53 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.links b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.links
index 04f3160e8..04f3160e8 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt3-java-trinity.links
+++ b/ubuntu/_base/kdebindings/debian/libqt3-java-trinity.links
diff --git a/ubuntu/maverick/kdebindings/debian/libqt3-jni-trinity.docs b/ubuntu/_base/kdebindings/debian/libqt3-jni-trinity.docs
index 90a6f2219..90a6f2219 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt3-jni-trinity.docs
+++ b/ubuntu/_base/kdebindings/debian/libqt3-jni-trinity.docs
diff --git a/ubuntu/maverick/kdebindings/debian/libqt3-jni-trinity.install b/ubuntu/_base/kdebindings/debian/libqt3-jni-trinity.install
index 0c879683b..0c879683b 100644
--- a/ubuntu/maverick/kdebindings/debian/libqt3-jni-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libqt3-jni-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libsmokekde-trinity-dev.install b/ubuntu/_base/kdebindings/debian/libsmokekde-trinity-dev.install
index 85021cc40..85021cc40 100644
--- a/ubuntu/maverick/kdebindings/debian/libsmokekde-trinity-dev.install
+++ b/ubuntu/_base/kdebindings/debian/libsmokekde-trinity-dev.install
diff --git a/ubuntu/maverick/kdebindings/debian/libsmokekde-trinity-dev.links b/ubuntu/_base/kdebindings/debian/libsmokekde-trinity-dev.links
index da4b8e1a2..da4b8e1a2 100644
--- a/ubuntu/maverick/kdebindings/debian/libsmokekde-trinity-dev.links
+++ b/ubuntu/_base/kdebindings/debian/libsmokekde-trinity-dev.links
diff --git a/ubuntu/maverick/kdebindings/debian/libsmokekde1-trinity.install b/ubuntu/_base/kdebindings/debian/libsmokekde1-trinity.install
index 173913313..173913313 100644
--- a/ubuntu/maverick/kdebindings/debian/libsmokekde1-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libsmokekde1-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libsmokeqt-trinity-dev.install b/ubuntu/_base/kdebindings/debian/libsmokeqt-trinity-dev.install
index 2904a6815..2904a6815 100644
--- a/ubuntu/maverick/kdebindings/debian/libsmokeqt-trinity-dev.install
+++ b/ubuntu/_base/kdebindings/debian/libsmokeqt-trinity-dev.install
diff --git a/ubuntu/maverick/kdebindings/debian/libsmokeqt-trinity-dev.links b/ubuntu/_base/kdebindings/debian/libsmokeqt-trinity-dev.links
index ba0272c14..ba0272c14 100644
--- a/ubuntu/maverick/kdebindings/debian/libsmokeqt-trinity-dev.links
+++ b/ubuntu/_base/kdebindings/debian/libsmokeqt-trinity-dev.links
diff --git a/ubuntu/maverick/kdebindings/debian/libsmokeqt1-trinity.install b/ubuntu/_base/kdebindings/debian/libsmokeqt1-trinity.install
index 3bf2b300b..3bf2b300b 100644
--- a/ubuntu/maverick/kdebindings/debian/libsmokeqt1-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libsmokeqt1-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.README.Debian b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.README.Debian
index 7b0f5a847..7b0f5a847 100644
--- a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.README.Debian
+++ b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.README.Debian
diff --git a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.dirs b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.dirs
index 02807ba4b..02807ba4b 100644
--- a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.dirs
+++ b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.dirs
diff --git a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.docs b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.docs
index 6f113fce7..6f113fce7 100644
--- a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.docs
+++ b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.docs
diff --git a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.install b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.install
index 9ea8f63c7..9ea8f63c7 100644
--- a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.links b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.links
index 3d5d71d6a..3d5d71d6a 100644
--- a/ubuntu/maverick/kdebindings/debian/libtrinity-java-trinity.links
+++ b/ubuntu/_base/kdebindings/debian/libtrinity-java-trinity.links
diff --git a/ubuntu/maverick/kdebindings/debian/libtrinity-jni-trinity.docs b/ubuntu/_base/kdebindings/debian/libtrinity-jni-trinity.docs
index 56222195b..56222195b 100644
--- a/ubuntu/maverick/kdebindings/debian/libtrinity-jni-trinity.docs
+++ b/ubuntu/_base/kdebindings/debian/libtrinity-jni-trinity.docs
diff --git a/ubuntu/maverick/kdebindings/debian/libtrinity-jni-trinity.install b/ubuntu/_base/kdebindings/debian/libtrinity-jni-trinity.install
index 0c661dcee..0c661dcee 100644
--- a/ubuntu/maverick/kdebindings/debian/libtrinity-jni-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/libtrinity-jni-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/local/dcopidl2java.1 b/ubuntu/_base/kdebindings/debian/local/dcopidl2java.1
index 926d78391..926d78391 100644
--- a/ubuntu/maverick/kdebindings/debian/local/dcopidl2java.1
+++ b/ubuntu/_base/kdebindings/debian/local/dcopidl2java.1
diff --git a/ubuntu/maverick/kdebindings/debian/local/juic.1 b/ubuntu/_base/kdebindings/debian/local/juic.1
index 08aba74f8..08aba74f8 100644
--- a/ubuntu/maverick/kdebindings/debian/local/juic.1
+++ b/ubuntu/_base/kdebindings/debian/local/juic.1
diff --git a/ubuntu/maverick/kdebindings/debian/local/krubyinit.1 b/ubuntu/_base/kdebindings/debian/local/krubyinit.1
index 21cd93112..21cd93112 100644
--- a/ubuntu/maverick/kdebindings/debian/local/krubyinit.1
+++ b/ubuntu/_base/kdebindings/debian/local/krubyinit.1
diff --git a/ubuntu/maverick/kdebindings/debian/local/qtrubyinit.1 b/ubuntu/_base/kdebindings/debian/local/qtrubyinit.1
index 61a505863..61a505863 100644
--- a/ubuntu/maverick/kdebindings/debian/local/qtrubyinit.1
+++ b/ubuntu/_base/kdebindings/debian/local/qtrubyinit.1
diff --git a/ubuntu/maverick/kdebindings/debian/local/rbkdeapi.1 b/ubuntu/_base/kdebindings/debian/local/rbkdeapi.1
index ba6772436..ba6772436 100644
--- a/ubuntu/maverick/kdebindings/debian/local/rbkdeapi.1
+++ b/ubuntu/_base/kdebindings/debian/local/rbkdeapi.1
diff --git a/ubuntu/maverick/kdebindings/debian/local/rbkdesh.1 b/ubuntu/_base/kdebindings/debian/local/rbkdesh.1
index 1fd7b6784..1fd7b6784 100644
--- a/ubuntu/maverick/kdebindings/debian/local/rbkdesh.1
+++ b/ubuntu/_base/kdebindings/debian/local/rbkdesh.1
diff --git a/ubuntu/maverick/kdebindings/debian/local/rbqtapi.1 b/ubuntu/_base/kdebindings/debian/local/rbqtapi.1
index e89b6f57d..e89b6f57d 100644
--- a/ubuntu/maverick/kdebindings/debian/local/rbqtapi.1
+++ b/ubuntu/_base/kdebindings/debian/local/rbqtapi.1
diff --git a/ubuntu/maverick/kdebindings/debian/local/rbqtsh.1 b/ubuntu/_base/kdebindings/debian/local/rbqtsh.1
index dfa020d3d..dfa020d3d 100644
--- a/ubuntu/maverick/kdebindings/debian/local/rbqtsh.1
+++ b/ubuntu/_base/kdebindings/debian/local/rbqtsh.1
diff --git a/ubuntu/maverick/kdebindings/debian/local/rbuic.1 b/ubuntu/_base/kdebindings/debian/local/rbuic.1
index 5191cd7b6..5191cd7b6 100644
--- a/ubuntu/maverick/kdebindings/debian/local/rbuic.1
+++ b/ubuntu/_base/kdebindings/debian/local/rbuic.1
diff --git a/ubuntu/maverick/kdebindings/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdebindings/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdebindings/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdebindings/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdebindings/debian/patches/common/05_pedantic-errors.diff b/ubuntu/_base/kdebindings/debian/patches/common/05_pedantic-errors.diff
index ce2883918..ce2883918 100644
--- a/ubuntu/maverick/kdebindings/debian/patches/common/05_pedantic-errors.diff
+++ b/ubuntu/_base/kdebindings/debian/patches/common/05_pedantic-errors.diff
diff --git a/ubuntu/maverick/kdebindings/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdebindings/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdebindings/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdebindings/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdebindings/debian/patches/series b/ubuntu/_base/kdebindings/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdebindings/debian/patches/series
+++ b/ubuntu/_base/kdebindings/debian/patches/series
diff --git a/ubuntu/maverick/kdebindings/debian/python-dcop-trinity.docs b/ubuntu/_base/kdebindings/debian/python-dcop-trinity.docs
index 957d3af3e..957d3af3e 100644
--- a/ubuntu/maverick/kdebindings/debian/python-dcop-trinity.docs
+++ b/ubuntu/_base/kdebindings/debian/python-dcop-trinity.docs
diff --git a/ubuntu/maverick/kdebindings/debian/python-dcop-trinity.examples b/ubuntu/_base/kdebindings/debian/python-dcop-trinity.examples
index 4100d465b..4100d465b 100644
--- a/ubuntu/maverick/kdebindings/debian/python-dcop-trinity.examples
+++ b/ubuntu/_base/kdebindings/debian/python-dcop-trinity.examples
diff --git a/ubuntu/maverick/kdebindings/debian/python-dcop-trinity.install b/ubuntu/_base/kdebindings/debian/python-dcop-trinity.install
index 364b52d9d..364b52d9d 100644
--- a/ubuntu/maverick/kdebindings/debian/python-dcop-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/python-dcop-trinity.install
diff --git a/ubuntu/maverick/kdebindings/debian/rules b/ubuntu/_base/kdebindings/debian/rules
index 2a96323d3..2a96323d3 100755
--- a/ubuntu/maverick/kdebindings/debian/rules
+++ b/ubuntu/_base/kdebindings/debian/rules
diff --git a/ubuntu/maverick/kdebindings/debian/source/format b/ubuntu/_base/kdebindings/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdebindings/debian/source/format
+++ b/ubuntu/_base/kdebindings/debian/source/format
diff --git a/ubuntu/maverick/kdebindings/debian/source/options b/ubuntu/_base/kdebindings/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdebindings/debian/source/options
+++ b/ubuntu/_base/kdebindings/debian/source/options
diff --git a/ubuntu/maverick/kdebindings/debian/tde-xparts-extras-trinity.install b/ubuntu/_base/kdebindings/debian/tde-xparts-extras-trinity.install
index e29ab016c..e29ab016c 100644
--- a/ubuntu/maverick/kdebindings/debian/tde-xparts-extras-trinity.install
+++ b/ubuntu/_base/kdebindings/debian/tde-xparts-extras-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 385c47c14..385c47c14 100644
--- a/ubuntu/maverick/kdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdeedu/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdeedu/debian/blinken-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/blinken-trinity.README.Debian
index 987b4e48b..987b4e48b 100644
--- a/ubuntu/maverick/kdeedu/debian/blinken-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/blinken-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/blinken-trinity.docs b/ubuntu/_base/kdeedu/debian/blinken-trinity.docs
index e1c76b889..e1c76b889 100644
--- a/ubuntu/maverick/kdeedu/debian/blinken-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/blinken-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/blinken-trinity.install b/ubuntu/_base/kdeedu/debian/blinken-trinity.install
index b0a94f4f2..b0a94f4f2 100644
--- a/ubuntu/maverick/kdeedu/debian/blinken-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/blinken-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/blinken-trinity.manpages b/ubuntu/_base/kdeedu/debian/blinken-trinity.manpages
index bbad38ebc..bbad38ebc 100644
--- a/ubuntu/maverick/kdeedu/debian/blinken-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/blinken-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/blinken-trinity.menu b/ubuntu/_base/kdeedu/debian/blinken-trinity.menu
index 27d188afa..27d188afa 100644
--- a/ubuntu/maverick/kdeedu/debian/blinken-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/blinken-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdeedu/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdeedu/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdeedu/debian/cdbs/kde.mk b/ubuntu/_base/kdeedu/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdeedu/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdeedu/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdeedu/debian/cdbs/versions.pl b/ubuntu/_base/kdeedu/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdeedu/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdeedu/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdeedu/debian/changelog b/ubuntu/_base/kdeedu/debian/changelog
index a06503645..a06503645 100644
--- a/ubuntu/maverick/kdeedu/debian/changelog
+++ b/ubuntu/_base/kdeedu/debian/changelog
diff --git a/ubuntu/maverick/kdeedu/debian/compat b/ubuntu/_base/kdeedu/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdeedu/debian/compat
+++ b/ubuntu/_base/kdeedu/debian/compat
diff --git a/ubuntu/maverick/kdeedu/debian/control b/ubuntu/_base/kdeedu/debian/control
index 2c4158eae..2c4158eae 100644
--- a/ubuntu/maverick/kdeedu/debian/control
+++ b/ubuntu/_base/kdeedu/debian/control
diff --git a/ubuntu/maverick/kdeedu/debian/copyright b/ubuntu/_base/kdeedu/debian/copyright
index 272e4f376..272e4f376 100644
--- a/ubuntu/maverick/kdeedu/debian/copyright
+++ b/ubuntu/_base/kdeedu/debian/copyright
diff --git a/ubuntu/maverick/kdeedu/debian/icons/blinken.xpm b/ubuntu/_base/kdeedu/debian/icons/blinken.xpm
index 9aef8553a..9aef8553a 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/blinken.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/blinken.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kalzium.xpm b/ubuntu/_base/kdeedu/debian/icons/kalzium.xpm
index 3f265dcc9..3f265dcc9 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kalzium.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kalzium.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kanagram.xpm b/ubuntu/_base/kdeedu/debian/icons/kanagram.xpm
index d8fa0895d..d8fa0895d 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kanagram.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kanagram.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kbruch.xpm b/ubuntu/_base/kdeedu/debian/icons/kbruch.xpm
index 9c4c6d33e..9c4c6d33e 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kbruch.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kbruch.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/keduca.xpm b/ubuntu/_base/kdeedu/debian/icons/keduca.xpm
index e4ddce938..e4ddce938 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/keduca.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/keduca.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kgeography.xpm b/ubuntu/_base/kdeedu/debian/icons/kgeography.xpm
index 34e91c81f..34e91c81f 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kgeography.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kgeography.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/khangman.xpm b/ubuntu/_base/kdeedu/debian/icons/khangman.xpm
index 18251829d..18251829d 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/khangman.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/khangman.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kig.xpm b/ubuntu/_base/kdeedu/debian/icons/kig.xpm
index e518e618a..e518e618a 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kig.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kig.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kiten.xpm b/ubuntu/_base/kdeedu/debian/icons/kiten.xpm
index 92101a430..92101a430 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kiten.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kiten.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/klatin.xpm b/ubuntu/_base/kdeedu/debian/icons/klatin.xpm
index 1e8cccf38..1e8cccf38 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/klatin.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/klatin.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/klettres.xpm b/ubuntu/_base/kdeedu/debian/icons/klettres.xpm
index be4851eee..be4851eee 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/klettres.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/klettres.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kmplot.xpm b/ubuntu/_base/kdeedu/debian/icons/kmplot.xpm
index a37fbc778..a37fbc778 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kmplot.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kmplot.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kpercentage.xpm b/ubuntu/_base/kdeedu/debian/icons/kpercentage.xpm
index 4f4b77fd2..4f4b77fd2 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kpercentage.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kpercentage.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kstars.xpm b/ubuntu/_base/kdeedu/debian/icons/kstars.xpm
index d7c0c52db..d7c0c52db 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kstars.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kstars.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/ktouch.xpm b/ubuntu/_base/kdeedu/debian/icons/ktouch.xpm
index 93378760a..93378760a 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/ktouch.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/ktouch.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kturtle.xpm b/ubuntu/_base/kdeedu/debian/icons/kturtle.xpm
index ebde8cd2d..ebde8cd2d 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kturtle.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kturtle.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kverbos.xpm b/ubuntu/_base/kdeedu/debian/icons/kverbos.xpm
index 2a3e33969..2a3e33969 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kverbos.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kverbos.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kvoctrain.xpm b/ubuntu/_base/kdeedu/debian/icons/kvoctrain.xpm
index bb2421754..bb2421754 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kvoctrain.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kvoctrain.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/icons/kwordquiz.xpm b/ubuntu/_base/kdeedu/debian/icons/kwordquiz.xpm
index 7d855ed5e..7d855ed5e 100644
--- a/ubuntu/maverick/kdeedu/debian/icons/kwordquiz.xpm
+++ b/ubuntu/_base/kdeedu/debian/icons/kwordquiz.xpm
diff --git a/ubuntu/maverick/kdeedu/debian/indi-trinity.docs b/ubuntu/_base/kdeedu/debian/indi-trinity.docs
index 4972ae664..4972ae664 100644
--- a/ubuntu/maverick/kdeedu/debian/indi-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/indi-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/indi-trinity.install b/ubuntu/_base/kdeedu/debian/indi-trinity.install
index 82db36a4a..82db36a4a 100644
--- a/ubuntu/maverick/kdeedu/debian/indi-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/indi-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/indi-trinity.install.kfreebsd-i386 b/ubuntu/_base/kdeedu/debian/indi-trinity.install.kfreebsd-i386
index 40860ff1a..40860ff1a 100644
--- a/ubuntu/maverick/kdeedu/debian/indi-trinity.install.kfreebsd-i386
+++ b/ubuntu/_base/kdeedu/debian/indi-trinity.install.kfreebsd-i386
diff --git a/ubuntu/maverick/kdeedu/debian/indi-trinity.manpages b/ubuntu/_base/kdeedu/debian/indi-trinity.manpages
index 1c974f253..1c974f253 100644
--- a/ubuntu/maverick/kdeedu/debian/indi-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/indi-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kalzium-data-trinity.install b/ubuntu/_base/kdeedu/debian/kalzium-data-trinity.install
index 05ae14025..05ae14025 100644
--- a/ubuntu/maverick/kdeedu/debian/kalzium-data-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kalzium-data-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kalzium-trinity.README.Debian
index ab3aedfb9..ab3aedfb9 100644
--- a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kalzium-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.docs b/ubuntu/_base/kdeedu/debian/kalzium-trinity.docs
index a7127e507..a7127e507 100644
--- a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kalzium-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.install b/ubuntu/_base/kdeedu/debian/kalzium-trinity.install
index 9b9bca470..9b9bca470 100644
--- a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kalzium-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.manpages b/ubuntu/_base/kdeedu/debian/kalzium-trinity.manpages
index 2ac62d8e2..2ac62d8e2 100644
--- a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kalzium-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.menu b/ubuntu/_base/kdeedu/debian/kalzium-trinity.menu
index 8150473ae..8150473ae 100644
--- a/ubuntu/maverick/kdeedu/debian/kalzium-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kalzium-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kanagram-trinity.README.Debian
index 5c94d6832..5c94d6832 100644
--- a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kanagram-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.docs b/ubuntu/_base/kdeedu/debian/kanagram-trinity.docs
index 99ffc3dc2..99ffc3dc2 100644
--- a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kanagram-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.install b/ubuntu/_base/kdeedu/debian/kanagram-trinity.install
index 4793db665..4793db665 100644
--- a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kanagram-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.manpages b/ubuntu/_base/kdeedu/debian/kanagram-trinity.manpages
index bf36c99a5..bf36c99a5 100644
--- a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kanagram-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.menu b/ubuntu/_base/kdeedu/debian/kanagram-trinity.menu
index 2ae493c03..2ae493c03 100644
--- a/ubuntu/maverick/kdeedu/debian/kanagram-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kanagram-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kbruch-trinity.README.Debian
index 3c67ecb17..3c67ecb17 100644
--- a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kbruch-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.docs b/ubuntu/_base/kdeedu/debian/kbruch-trinity.docs
index 9affc1576..9affc1576 100644
--- a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kbruch-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.install b/ubuntu/_base/kdeedu/debian/kbruch-trinity.install
index e32bda253..e32bda253 100644
--- a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kbruch-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.manpages b/ubuntu/_base/kdeedu/debian/kbruch-trinity.manpages
index 622f534e2..622f534e2 100644
--- a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kbruch-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.menu b/ubuntu/_base/kdeedu/debian/kbruch-trinity.menu
index 895407a25..895407a25 100644
--- a/ubuntu/maverick/kdeedu/debian/kbruch-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kbruch-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-data-trinity.install b/ubuntu/_base/kdeedu/debian/kdeedu-data-trinity.install
index 021e2b38d..021e2b38d 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-data-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-data-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.blinken b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.blinken
index 0981d3897..0981d3897 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.blinken
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.blinken
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium
index 41475e0ee..41475e0ee 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kalzium
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch
index 117156815..117156815 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kbruch
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.keduca b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.keduca
index 810f29b8c..810f29b8c 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.keduca
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.keduca
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kgeography b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kgeography
index 0f3d386af..0f3d386af 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kgeography
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kgeography
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.khangman b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.khangman
index c6b25da48..c6b25da48 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.khangman
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.khangman
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kig b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kig
index e8569fb22..e8569fb22 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kig
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kig
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kiten b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kiten
index a8b4130a6..a8b4130a6 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kiten
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kiten
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.klatin b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.klatin
index a5f795b93..a5f795b93 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.klatin
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.klatin
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.klettres b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.klettres
index 9c3595aad..9c3595aad 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.klettres
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.klettres
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot
index 6a2342dab..6a2342dab 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kmplot
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage
index 2c172778c..2c172778c 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kpercentage
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kstars b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kstars
index 33b5ec707..33b5ec707 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kstars
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kstars
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch
index a7815e054..a7815e054 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.ktouch
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle
index 3104fe43e..3104fe43e 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kturtle
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos
index 6a1dd3d86..6a1dd3d86 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kverbos
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain
index a789694b6..a789694b6 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kvoctrain
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
index 1635db7e2..1635db7e2 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-doc-html.doc-base.kwordquiz
diff --git a/ubuntu/maverick/kdeedu/debian/kdeedu-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kdeedu-trinity.README.Debian
index f608d0cfb..f608d0cfb 100644
--- a/ubuntu/maverick/kdeedu/debian/kdeedu-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kdeedu-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/keduca-shrinker b/ubuntu/_base/kdeedu/debian/keduca-shrinker
index 188b3e0ef..188b3e0ef 100644
--- a/ubuntu/maverick/kdeedu/debian/keduca-shrinker
+++ b/ubuntu/_base/kdeedu/debian/keduca-shrinker
diff --git a/ubuntu/maverick/kdeedu/debian/keduca-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/keduca-trinity.README.Debian
index 042f785f1..042f785f1 100644
--- a/ubuntu/maverick/kdeedu/debian/keduca-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/keduca-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/keduca-trinity.docs b/ubuntu/_base/kdeedu/debian/keduca-trinity.docs
index 8999d5487..8999d5487 100644
--- a/ubuntu/maverick/kdeedu/debian/keduca-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/keduca-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/keduca-trinity.install b/ubuntu/_base/kdeedu/debian/keduca-trinity.install
index 10264f55f..10264f55f 100644
--- a/ubuntu/maverick/kdeedu/debian/keduca-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/keduca-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/keduca-trinity.manpages b/ubuntu/_base/kdeedu/debian/keduca-trinity.manpages
index 99bab9f63..99bab9f63 100644
--- a/ubuntu/maverick/kdeedu/debian/keduca-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/keduca-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/keduca-trinity.menu b/ubuntu/_base/kdeedu/debian/keduca-trinity.menu
index 58650bb79..58650bb79 100644
--- a/ubuntu/maverick/kdeedu/debian/keduca-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/keduca-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kgeography-data-trinity.install b/ubuntu/_base/kdeedu/debian/kgeography-data-trinity.install
index 9fbb1a151..9fbb1a151 100644
--- a/ubuntu/maverick/kdeedu/debian/kgeography-data-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kgeography-data-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kgeography-trinity.README.Debian
index 90b3dd1a4..90b3dd1a4 100644
--- a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kgeography-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.docs b/ubuntu/_base/kdeedu/debian/kgeography-trinity.docs
index 1e7ef4e27..1e7ef4e27 100644
--- a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kgeography-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.install b/ubuntu/_base/kdeedu/debian/kgeography-trinity.install
index 01bde9d25..01bde9d25 100644
--- a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kgeography-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.manpages b/ubuntu/_base/kdeedu/debian/kgeography-trinity.manpages
index 390e2bed2..390e2bed2 100644
--- a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kgeography-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.menu b/ubuntu/_base/kdeedu/debian/kgeography-trinity.menu
index 0bf2a46b0..0bf2a46b0 100644
--- a/ubuntu/maverick/kdeedu/debian/kgeography-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kgeography-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/khangman-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/khangman-trinity.README.Debian
index 3f9ecc785..3f9ecc785 100644
--- a/ubuntu/maverick/kdeedu/debian/khangman-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/khangman-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/khangman-trinity.docs b/ubuntu/_base/kdeedu/debian/khangman-trinity.docs
index 9b12a19b3..9b12a19b3 100644
--- a/ubuntu/maverick/kdeedu/debian/khangman-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/khangman-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/khangman-trinity.install b/ubuntu/_base/kdeedu/debian/khangman-trinity.install
index 2047c5ecb..2047c5ecb 100644
--- a/ubuntu/maverick/kdeedu/debian/khangman-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/khangman-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/khangman-trinity.manpages b/ubuntu/_base/kdeedu/debian/khangman-trinity.manpages
index b49d3e8fd..b49d3e8fd 100644
--- a/ubuntu/maverick/kdeedu/debian/khangman-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/khangman-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/khangman-trinity.menu b/ubuntu/_base/kdeedu/debian/khangman-trinity.menu
index 14019cf51..14019cf51 100644
--- a/ubuntu/maverick/kdeedu/debian/khangman-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/khangman-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kig-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kig-trinity.README.Debian
index 567300de0..567300de0 100644
--- a/ubuntu/maverick/kdeedu/debian/kig-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kig-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kig-trinity.docs b/ubuntu/_base/kdeedu/debian/kig-trinity.docs
index 0226b94bb..0226b94bb 100644
--- a/ubuntu/maverick/kdeedu/debian/kig-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kig-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kig-trinity.install b/ubuntu/_base/kdeedu/debian/kig-trinity.install
index 55a817ea8..55a817ea8 100644
--- a/ubuntu/maverick/kdeedu/debian/kig-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kig-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kig-trinity.manpages b/ubuntu/_base/kdeedu/debian/kig-trinity.manpages
index 9d8d993a9..9d8d993a9 100644
--- a/ubuntu/maverick/kdeedu/debian/kig-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kig-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kig-trinity.menu b/ubuntu/_base/kdeedu/debian/kig-trinity.menu
index ae6ef3bb7..ae6ef3bb7 100644
--- a/ubuntu/maverick/kdeedu/debian/kig-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kig-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kiten-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kiten-trinity.README.Debian
index e860870ca..e860870ca 100644
--- a/ubuntu/maverick/kdeedu/debian/kiten-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kiten-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kiten-trinity.docs b/ubuntu/_base/kdeedu/debian/kiten-trinity.docs
index 92cb85823..92cb85823 100644
--- a/ubuntu/maverick/kdeedu/debian/kiten-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kiten-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kiten-trinity.install b/ubuntu/_base/kdeedu/debian/kiten-trinity.install
index 652f08bde..652f08bde 100644
--- a/ubuntu/maverick/kdeedu/debian/kiten-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kiten-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kiten-trinity.manpages b/ubuntu/_base/kdeedu/debian/kiten-trinity.manpages
index 1fd7ca049..1fd7ca049 100644
--- a/ubuntu/maverick/kdeedu/debian/kiten-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kiten-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kiten-trinity.menu b/ubuntu/_base/kdeedu/debian/kiten-trinity.menu
index 6acb9a175..6acb9a175 100644
--- a/ubuntu/maverick/kdeedu/debian/kiten-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kiten-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/klatin-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/klatin-trinity.README.Debian
index 30c214675..30c214675 100644
--- a/ubuntu/maverick/kdeedu/debian/klatin-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/klatin-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/klatin-trinity.docs b/ubuntu/_base/kdeedu/debian/klatin-trinity.docs
index df25d33f1..df25d33f1 100644
--- a/ubuntu/maverick/kdeedu/debian/klatin-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/klatin-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/klatin-trinity.install b/ubuntu/_base/kdeedu/debian/klatin-trinity.install
index 239a231f0..239a231f0 100644
--- a/ubuntu/maverick/kdeedu/debian/klatin-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/klatin-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/klatin-trinity.manpages b/ubuntu/_base/kdeedu/debian/klatin-trinity.manpages
index 72c7f2719..72c7f2719 100644
--- a/ubuntu/maverick/kdeedu/debian/klatin-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/klatin-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/klatin-trinity.menu b/ubuntu/_base/kdeedu/debian/klatin-trinity.menu
index d25c39903..d25c39903 100644
--- a/ubuntu/maverick/kdeedu/debian/klatin-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/klatin-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/klettres-data-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/klettres-data-trinity.README.Debian
index 6e0ac76cc..6e0ac76cc 100644
--- a/ubuntu/maverick/kdeedu/debian/klettres-data-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/klettres-data-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/klettres-data-trinity.docs b/ubuntu/_base/kdeedu/debian/klettres-data-trinity.docs
index 3f3b2d265..3f3b2d265 100644
--- a/ubuntu/maverick/kdeedu/debian/klettres-data-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/klettres-data-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/klettres-data-trinity.install b/ubuntu/_base/kdeedu/debian/klettres-data-trinity.install
index fa8533f0e..fa8533f0e 100644
--- a/ubuntu/maverick/kdeedu/debian/klettres-data-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/klettres-data-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/klettres-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/klettres-trinity.README.Debian
index 2b3b8944e..2b3b8944e 100644
--- a/ubuntu/maverick/kdeedu/debian/klettres-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/klettres-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/klettres-trinity.docs b/ubuntu/_base/kdeedu/debian/klettres-trinity.docs
index 3f3b2d265..3f3b2d265 100644
--- a/ubuntu/maverick/kdeedu/debian/klettres-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/klettres-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/klettres-trinity.install b/ubuntu/_base/kdeedu/debian/klettres-trinity.install
index 793cc5d84..793cc5d84 100644
--- a/ubuntu/maverick/kdeedu/debian/klettres-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/klettres-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/klettres-trinity.manpages b/ubuntu/_base/kdeedu/debian/klettres-trinity.manpages
index 769e1a35e..769e1a35e 100644
--- a/ubuntu/maverick/kdeedu/debian/klettres-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/klettres-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/klettres-trinity.menu b/ubuntu/_base/kdeedu/debian/klettres-trinity.menu
index 7fc2ff5d1..7fc2ff5d1 100644
--- a/ubuntu/maverick/kdeedu/debian/klettres-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/klettres-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kmplot-trinity.README.Debian
index f1e947ca3..f1e947ca3 100644
--- a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kmplot-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.docs b/ubuntu/_base/kdeedu/debian/kmplot-trinity.docs
index 3c0de4f5d..3c0de4f5d 100644
--- a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kmplot-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.install b/ubuntu/_base/kdeedu/debian/kmplot-trinity.install
index c75adb783..c75adb783 100644
--- a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kmplot-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.manpages b/ubuntu/_base/kdeedu/debian/kmplot-trinity.manpages
index 347f3c24b..347f3c24b 100644
--- a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kmplot-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.menu b/ubuntu/_base/kdeedu/debian/kmplot-trinity.menu
index 6315ba999..6315ba999 100644
--- a/ubuntu/maverick/kdeedu/debian/kmplot-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kmplot-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.README.Debian
index 2864356e4..2864356e4 100644
--- a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.docs b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.docs
index 4c4a6a22e..4c4a6a22e 100644
--- a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.install b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.install
index 592f5475b..592f5475b 100644
--- a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.manpages b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.manpages
index a08d7f942..a08d7f942 100644
--- a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.menu b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.menu
index 8196c2b98..8196c2b98 100644
--- a/ubuntu/maverick/kdeedu/debian/kpercentage-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kpercentage-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kstars-data-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kstars-data-trinity.README.Debian
index 7032707b2..7032707b2 100644
--- a/ubuntu/maverick/kdeedu/debian/kstars-data-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kstars-data-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kstars-data-trinity.docs b/ubuntu/_base/kdeedu/debian/kstars-data-trinity.docs
index 498ca09be..498ca09be 100644
--- a/ubuntu/maverick/kdeedu/debian/kstars-data-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kstars-data-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kstars-data-trinity.install b/ubuntu/_base/kdeedu/debian/kstars-data-trinity.install
index 5ccd88f52..5ccd88f52 100644
--- a/ubuntu/maverick/kdeedu/debian/kstars-data-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kstars-data-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kstars-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kstars-trinity.README.Debian
index f709389fa..f709389fa 100644
--- a/ubuntu/maverick/kdeedu/debian/kstars-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kstars-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kstars-trinity.docs b/ubuntu/_base/kdeedu/debian/kstars-trinity.docs
index 498ca09be..498ca09be 100644
--- a/ubuntu/maverick/kdeedu/debian/kstars-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kstars-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kstars-trinity.install b/ubuntu/_base/kdeedu/debian/kstars-trinity.install
index 31da35a55..31da35a55 100644
--- a/ubuntu/maverick/kdeedu/debian/kstars-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kstars-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kstars-trinity.manpages b/ubuntu/_base/kdeedu/debian/kstars-trinity.manpages
index e780d23cc..e780d23cc 100644
--- a/ubuntu/maverick/kdeedu/debian/kstars-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kstars-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kstars-trinity.menu b/ubuntu/_base/kdeedu/debian/kstars-trinity.menu
index 6afa4e411..6afa4e411 100644
--- a/ubuntu/maverick/kdeedu/debian/kstars-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kstars-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/ktouch-trinity.README.Debian
index 7f42f52c0..7f42f52c0 100644
--- a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/ktouch-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.docs b/ubuntu/_base/kdeedu/debian/ktouch-trinity.docs
index b24780ab4..b24780ab4 100644
--- a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/ktouch-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.install b/ubuntu/_base/kdeedu/debian/ktouch-trinity.install
index da2308667..da2308667 100644
--- a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/ktouch-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.manpages b/ubuntu/_base/kdeedu/debian/ktouch-trinity.manpages
index 3c91278db..3c91278db 100644
--- a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/ktouch-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.menu b/ubuntu/_base/kdeedu/debian/ktouch-trinity.menu
index dc1037238..dc1037238 100644
--- a/ubuntu/maverick/kdeedu/debian/ktouch-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/ktouch-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kturtle-trinity.README.Debian
index 122150a00..122150a00 100644
--- a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kturtle-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.docs b/ubuntu/_base/kdeedu/debian/kturtle-trinity.docs
index ef5b58bc9..ef5b58bc9 100644
--- a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kturtle-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.install b/ubuntu/_base/kdeedu/debian/kturtle-trinity.install
index f5f42ad75..f5f42ad75 100644
--- a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kturtle-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.manpages b/ubuntu/_base/kdeedu/debian/kturtle-trinity.manpages
index f0a3e17d8..f0a3e17d8 100644
--- a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kturtle-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.menu b/ubuntu/_base/kdeedu/debian/kturtle-trinity.menu
index b1de72c0e..b1de72c0e 100644
--- a/ubuntu/maverick/kdeedu/debian/kturtle-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kturtle-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kverbos-trinity.README.Debian
index a2a469e40..a2a469e40 100644
--- a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kverbos-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.docs b/ubuntu/_base/kdeedu/debian/kverbos-trinity.docs
index 950e6d59f..950e6d59f 100644
--- a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kverbos-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.install b/ubuntu/_base/kdeedu/debian/kverbos-trinity.install
index 7ce86854f..7ce86854f 100644
--- a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kverbos-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.manpages b/ubuntu/_base/kdeedu/debian/kverbos-trinity.manpages
index d47a4e1b1..d47a4e1b1 100644
--- a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kverbos-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.menu b/ubuntu/_base/kdeedu/debian/kverbos-trinity.menu
index f6aece42e..f6aece42e 100644
--- a/ubuntu/maverick/kdeedu/debian/kverbos-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kverbos-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.README.Debian
index 6dcfee0ed..6dcfee0ed 100644
--- a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.docs b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.docs
index a6f1a9161..a6f1a9161 100644
--- a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.install b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.install
index 07d71a27f..07d71a27f 100644
--- a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.manpages b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.manpages
index c02c3041f..c02c3041f 100644
--- a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.menu b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.menu
index 65716e3c1..65716e3c1 100644
--- a/ubuntu/maverick/kdeedu/debian/kvoctrain-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kvoctrain-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.README.Debian b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.README.Debian
index cf3009383..cf3009383 100644
--- a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.README.Debian
+++ b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.README.Debian
diff --git a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.docs b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.docs
index cb0875fed..cb0875fed 100644
--- a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.install b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.install
index 6490edf60..6490edf60 100644
--- a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.manpages b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.manpages
index 1f4715f49..1f4715f49 100644
--- a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.menu b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.menu
index bb408e28c..bb408e28c 100644
--- a/ubuntu/maverick/kdeedu/debian/kwordquiz-trinity.menu
+++ b/ubuntu/_base/kdeedu/debian/kwordquiz-trinity.menu
diff --git a/ubuntu/maverick/kdeedu/debian/libkdeedu-dev-trinity.docs b/ubuntu/_base/kdeedu/debian/libkdeedu-dev-trinity.docs
index 16da301c1..16da301c1 100644
--- a/ubuntu/maverick/kdeedu/debian/libkdeedu-dev-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/libkdeedu-dev-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/libkdeedu-dev-trinity.install b/ubuntu/_base/kdeedu/debian/libkdeedu-dev-trinity.install
index 50fcf50ea..50fcf50ea 100644
--- a/ubuntu/maverick/kdeedu/debian/libkdeedu-dev-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/libkdeedu-dev-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/libkdeedu-dev-trinity.manpages b/ubuntu/_base/kdeedu/debian/libkdeedu-dev-trinity.manpages
index b1292516f..b1292516f 100644
--- a/ubuntu/maverick/kdeedu/debian/libkdeedu-dev-trinity.manpages
+++ b/ubuntu/_base/kdeedu/debian/libkdeedu-dev-trinity.manpages
diff --git a/ubuntu/maverick/kdeedu/debian/libkdeedu3-trinity.docs b/ubuntu/_base/kdeedu/debian/libkdeedu3-trinity.docs
index 16da301c1..16da301c1 100644
--- a/ubuntu/maverick/kdeedu/debian/libkdeedu3-trinity.docs
+++ b/ubuntu/_base/kdeedu/debian/libkdeedu3-trinity.docs
diff --git a/ubuntu/maverick/kdeedu/debian/libkdeedu3-trinity.install b/ubuntu/_base/kdeedu/debian/libkdeedu3-trinity.install
index 13f432e0e..13f432e0e 100644
--- a/ubuntu/maverick/kdeedu/debian/libkdeedu3-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/libkdeedu3-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/libkdeedu3-trinity.override b/ubuntu/_base/kdeedu/debian/libkdeedu3-trinity.override
index 348d4ae74..348d4ae74 100644
--- a/ubuntu/maverick/kdeedu/debian/libkdeedu3-trinity.override
+++ b/ubuntu/_base/kdeedu/debian/libkdeedu3-trinity.override
diff --git a/ubuntu/maverick/kdeedu/debian/libkiten-dev-trinity.install b/ubuntu/_base/kdeedu/debian/libkiten-dev-trinity.install
index ca0848fd9..ca0848fd9 100644
--- a/ubuntu/maverick/kdeedu/debian/libkiten-dev-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/libkiten-dev-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/libkiten1-trinity.install b/ubuntu/_base/kdeedu/debian/libkiten1-trinity.install
index 1d3ae5e00..1d3ae5e00 100644
--- a/ubuntu/maverick/kdeedu/debian/libkiten1-trinity.install
+++ b/ubuntu/_base/kdeedu/debian/libkiten1-trinity.install
diff --git a/ubuntu/maverick/kdeedu/debian/libkiten1-trinity.links b/ubuntu/_base/kdeedu/debian/libkiten1-trinity.links
index 0663edfd3..0663edfd3 100644
--- a/ubuntu/maverick/kdeedu/debian/libkiten1-trinity.links
+++ b/ubuntu/_base/kdeedu/debian/libkiten1-trinity.links
diff --git a/ubuntu/maverick/kdeedu/debian/man/blinken-trinity.1 b/ubuntu/_base/kdeedu/debian/man/blinken-trinity.1
index 97e123744..97e123744 100644
--- a/ubuntu/maverick/kdeedu/debian/man/blinken-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/blinken-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/celestrongps-trinity.1 b/ubuntu/_base/kdeedu/debian/man/celestrongps-trinity.1
index 2e675ff5d..2e675ff5d 100644
--- a/ubuntu/maverick/kdeedu/debian/man/celestrongps-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/celestrongps-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/fliccd-trinity.1 b/ubuntu/_base/kdeedu/debian/man/fliccd-trinity.1
index 732597f01..732597f01 100644
--- a/ubuntu/maverick/kdeedu/debian/man/fliccd-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/fliccd-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/indiserver-trinity.1 b/ubuntu/_base/kdeedu/debian/man/indiserver-trinity.1
index da656ccdb..da656ccdb 100644
--- a/ubuntu/maverick/kdeedu/debian/man/indiserver-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/indiserver-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kalzium-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kalzium-trinity.1
index 458a01f36..458a01f36 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kalzium-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kalzium-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kanagram-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kanagram-trinity.1
index 4dd60c243..4dd60c243 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kanagram-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kanagram-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kbruch-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kbruch-trinity.1
index 3f9646718..3f9646718 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kbruch-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kbruch-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/keduca-shrinker-trinity.1 b/ubuntu/_base/kdeedu/debian/man/keduca-shrinker-trinity.1
index 53715bed4..53715bed4 100644
--- a/ubuntu/maverick/kdeedu/debian/man/keduca-shrinker-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/keduca-shrinker-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/keduca-trinity.1 b/ubuntu/_base/kdeedu/debian/man/keduca-trinity.1
index 802444364..802444364 100644
--- a/ubuntu/maverick/kdeedu/debian/man/keduca-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/keduca-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/keducabuilder-trinity.1 b/ubuntu/_base/kdeedu/debian/man/keducabuilder-trinity.1
index 3f3e62554..3f3e62554 100644
--- a/ubuntu/maverick/kdeedu/debian/man/keducabuilder-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/keducabuilder-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kgeography-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kgeography-trinity.1
index 550f88394..550f88394 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kgeography-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kgeography-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/khangman-trinity.1 b/ubuntu/_base/kdeedu/debian/man/khangman-trinity.1
index 6620e7ff2..6620e7ff2 100644
--- a/ubuntu/maverick/kdeedu/debian/man/khangman-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/khangman-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kig-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kig-trinity.1
index a5b73cff1..a5b73cff1 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kig-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kig-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kiten-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kiten-trinity.1
index 1c91ac6ef..1c91ac6ef 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kiten-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kiten-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kitengen-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kitengen-trinity.1
index 35d59fe6a..35d59fe6a 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kitengen-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kitengen-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/klatin-trinity.1 b/ubuntu/_base/kdeedu/debian/man/klatin-trinity.1
index 3513adc99..3513adc99 100644
--- a/ubuntu/maverick/kdeedu/debian/man/klatin-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/klatin-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/klettres-trinity.1 b/ubuntu/_base/kdeedu/debian/man/klettres-trinity.1
index ecd3149b7..ecd3149b7 100644
--- a/ubuntu/maverick/kdeedu/debian/man/klettres-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/klettres-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kmplot-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kmplot-trinity.1
index 77d7130d6..77d7130d6 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kmplot-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kmplot-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kpercentage-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kpercentage-trinity.1
index 1fafd663a..1fafd663a 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kpercentage-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kpercentage-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kstars-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kstars-trinity.1
index 589d72527..589d72527 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kstars-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kstars-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/ktouch-trinity.1 b/ubuntu/_base/kdeedu/debian/man/ktouch-trinity.1
index 4f5a917ec..4f5a917ec 100644
--- a/ubuntu/maverick/kdeedu/debian/man/ktouch-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/ktouch-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kturtle-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kturtle-trinity.1
index 80a139e03..80a139e03 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kturtle-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kturtle-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kverbos-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kverbos-trinity.1
index b2207dd44..b2207dd44 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kverbos-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kverbos-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kvoctrain-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kvoctrain-trinity.1
index bfbef8dc7..bfbef8dc7 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kvoctrain-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kvoctrain-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/kwordquiz-trinity.1 b/ubuntu/_base/kdeedu/debian/man/kwordquiz-trinity.1
index b3508f99e..b3508f99e 100644
--- a/ubuntu/maverick/kdeedu/debian/man/kwordquiz-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/kwordquiz-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/langen2kvtml-trinity.1 b/ubuntu/_base/kdeedu/debian/man/langen2kvtml-trinity.1
index a48bfc713..a48bfc713 100644
--- a/ubuntu/maverick/kdeedu/debian/man/langen2kvtml-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/langen2kvtml-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/lx200_16-trinity.1 b/ubuntu/_base/kdeedu/debian/man/lx200_16-trinity.1
index 1ceb5b298..1ceb5b298 100644
--- a/ubuntu/maverick/kdeedu/debian/man/lx200_16-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/lx200_16-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/lx200autostar-trinity.1 b/ubuntu/_base/kdeedu/debian/man/lx200autostar-trinity.1
index efc2f5e88..efc2f5e88 100644
--- a/ubuntu/maverick/kdeedu/debian/man/lx200autostar-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/lx200autostar-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/lx200classic-trinity.1 b/ubuntu/_base/kdeedu/debian/man/lx200classic-trinity.1
index f785be32f..f785be32f 100644
--- a/ubuntu/maverick/kdeedu/debian/man/lx200classic-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/lx200classic-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/lx200generic-trinity.1 b/ubuntu/_base/kdeedu/debian/man/lx200generic-trinity.1
index cb07e7d81..cb07e7d81 100644
--- a/ubuntu/maverick/kdeedu/debian/man/lx200generic-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/lx200generic-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/lx200gps-trinity.1 b/ubuntu/_base/kdeedu/debian/man/lx200gps-trinity.1
index e0b4ccb33..e0b4ccb33 100644
--- a/ubuntu/maverick/kdeedu/debian/man/lx200gps-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/lx200gps-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/spotlight2kvtml-trinity.1 b/ubuntu/_base/kdeedu/debian/man/spotlight2kvtml-trinity.1
index e3a4b5415..e3a4b5415 100644
--- a/ubuntu/maverick/kdeedu/debian/man/spotlight2kvtml-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/spotlight2kvtml-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/temma-trinity.1 b/ubuntu/_base/kdeedu/debian/man/temma-trinity.1
index b88a146ae..b88a146ae 100644
--- a/ubuntu/maverick/kdeedu/debian/man/temma-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/temma-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/test_extdate-trinity.1 b/ubuntu/_base/kdeedu/debian/man/test_extdate-trinity.1
index f515e0d87..f515e0d87 100644
--- a/ubuntu/maverick/kdeedu/debian/man/test_extdate-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/test_extdate-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/test_extdatepicker-trinity.1 b/ubuntu/_base/kdeedu/debian/man/test_extdatepicker-trinity.1
index c207c51d8..c207c51d8 100644
--- a/ubuntu/maverick/kdeedu/debian/man/test_extdatepicker-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/test_extdatepicker-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/v4ldriver-trinity.1 b/ubuntu/_base/kdeedu/debian/man/v4ldriver-trinity.1
index 0fc1eca24..0fc1eca24 100644
--- a/ubuntu/maverick/kdeedu/debian/man/v4ldriver-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/v4ldriver-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/man/v4lphilips-trinity.1 b/ubuntu/_base/kdeedu/debian/man/v4lphilips-trinity.1
index 4511e30c3..4511e30c3 100644
--- a/ubuntu/maverick/kdeedu/debian/man/v4lphilips-trinity.1
+++ b/ubuntu/_base/kdeedu/debian/man/v4lphilips-trinity.1
diff --git a/ubuntu/maverick/kdeedu/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdeedu/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdeedu/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdeedu/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdeedu/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdeedu/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdeedu/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdeedu/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdeedu/debian/patches/series b/ubuntu/_base/kdeedu/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdeedu/debian/patches/series
+++ b/ubuntu/_base/kdeedu/debian/patches/series
diff --git a/ubuntu/maverick/kdeedu/debian/rules b/ubuntu/_base/kdeedu/debian/rules
index cb62b898c..cb62b898c 100755
--- a/ubuntu/maverick/kdeedu/debian/rules
+++ b/ubuntu/_base/kdeedu/debian/rules
diff --git a/ubuntu/maverick/kdeedu/debian/source/format b/ubuntu/_base/kdeedu/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdeedu/debian/source/format
+++ b/ubuntu/_base/kdeedu/debian/source/format
diff --git a/ubuntu/maverick/kdeedu/debian/source/options b/ubuntu/_base/kdeedu/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdeedu/debian/source/options
+++ b/ubuntu/_base/kdeedu/debian/source/options
diff --git a/ubuntu/maverick/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
index e51f03050..e51f03050 100644
--- a/ubuntu/maverick/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdegames/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdegames/debian/atlantik-trinity-dev.install b/ubuntu/_base/kdegames/debian/atlantik-trinity-dev.install
index b9052ce9a..b9052ce9a 100644
--- a/ubuntu/maverick/kdegames/debian/atlantik-trinity-dev.install
+++ b/ubuntu/_base/kdegames/debian/atlantik-trinity-dev.install
diff --git a/ubuntu/maverick/kdegames/debian/atlantik-trinity.install b/ubuntu/_base/kdegames/debian/atlantik-trinity.install
index d1c3e9730..d1c3e9730 100644
--- a/ubuntu/maverick/kdegames/debian/atlantik-trinity.install
+++ b/ubuntu/_base/kdegames/debian/atlantik-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/atlantik-trinity.links b/ubuntu/_base/kdegames/debian/atlantik-trinity.links
index b368efade..b368efade 100644
--- a/ubuntu/maverick/kdegames/debian/atlantik-trinity.links
+++ b/ubuntu/_base/kdegames/debian/atlantik-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/atlantik-trinity.manpages b/ubuntu/_base/kdegames/debian/atlantik-trinity.manpages
index ba9602ad7..ba9602ad7 100644
--- a/ubuntu/maverick/kdegames/debian/atlantik-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/atlantik-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/atlantik-trinity.menu b/ubuntu/_base/kdegames/debian/atlantik-trinity.menu
index 116271705..116271705 100644
--- a/ubuntu/maverick/kdegames/debian/atlantik-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/atlantik-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdegames/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdegames/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdegames/debian/cdbs/kde.mk b/ubuntu/_base/kdegames/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdegames/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdegames/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdegames/debian/cdbs/versions.pl b/ubuntu/_base/kdegames/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdegames/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdegames/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdegames/debian/changelog b/ubuntu/_base/kdegames/debian/changelog
index 1ca7df725..1ca7df725 100644
--- a/ubuntu/maverick/kdegames/debian/changelog
+++ b/ubuntu/_base/kdegames/debian/changelog
diff --git a/ubuntu/maverick/kdegames/debian/compat b/ubuntu/_base/kdegames/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdegames/debian/compat
+++ b/ubuntu/_base/kdegames/debian/compat
diff --git a/ubuntu/maverick/kdegames/debian/control b/ubuntu/_base/kdegames/debian/control
index 9c4469458..9c4469458 100644
--- a/ubuntu/maverick/kdegames/debian/control
+++ b/ubuntu/_base/kdegames/debian/control
diff --git a/ubuntu/maverick/kdegames/debian/copyright b/ubuntu/_base/kdegames/debian/copyright
index 051cacea9..051cacea9 100644
--- a/ubuntu/maverick/kdegames/debian/copyright
+++ b/ubuntu/_base/kdegames/debian/copyright
diff --git a/ubuntu/maverick/kdegames/debian/icons/atlantik-16.xpm b/ubuntu/_base/kdegames/debian/icons/atlantik-16.xpm
index 611f1f97a..611f1f97a 100644
--- a/ubuntu/maverick/kdegames/debian/icons/atlantik-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/atlantik-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/atlantik.xpm b/ubuntu/_base/kdegames/debian/icons/atlantik.xpm
index bedcf6cc1..bedcf6cc1 100644
--- a/ubuntu/maverick/kdegames/debian/icons/atlantik.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/atlantik.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kasteroids-16.xpm b/ubuntu/_base/kdegames/debian/icons/kasteroids-16.xpm
index c15e3b0ee..c15e3b0ee 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kasteroids-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kasteroids-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kasteroids.xpm b/ubuntu/_base/kdegames/debian/icons/kasteroids.xpm
index f73c45dee..f73c45dee 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kasteroids.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kasteroids.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/katomic-16.xpm b/ubuntu/_base/kdegames/debian/icons/katomic-16.xpm
index 2d34f8adc..2d34f8adc 100644
--- a/ubuntu/maverick/kdegames/debian/icons/katomic-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/katomic-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/katomic.xpm b/ubuntu/_base/kdegames/debian/icons/katomic.xpm
index d8cca7cf5..d8cca7cf5 100644
--- a/ubuntu/maverick/kdegames/debian/icons/katomic.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/katomic.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kbackgammon-16.xpm b/ubuntu/_base/kdegames/debian/icons/kbackgammon-16.xpm
index 810a024dc..810a024dc 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kbackgammon-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kbackgammon-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kbackgammon.xpm b/ubuntu/_base/kdegames/debian/icons/kbackgammon.xpm
index 5cd453abb..5cd453abb 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kbackgammon.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kbackgammon.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kbattleship-16.xpm b/ubuntu/_base/kdegames/debian/icons/kbattleship-16.xpm
index 907010be4..907010be4 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kbattleship-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kbattleship-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kbattleship.xpm b/ubuntu/_base/kdegames/debian/icons/kbattleship.xpm
index 2dd29f5f2..2dd29f5f2 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kbattleship.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kbattleship.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kblackbox-16.xpm b/ubuntu/_base/kdegames/debian/icons/kblackbox-16.xpm
index 812f7db3d..812f7db3d 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kblackbox-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kblackbox-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kblackbox.xpm b/ubuntu/_base/kdegames/debian/icons/kblackbox.xpm
index 203307693..203307693 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kblackbox.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kblackbox.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kbounce-16.xpm b/ubuntu/_base/kdegames/debian/icons/kbounce-16.xpm
index 28c9599ec..28c9599ec 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kbounce-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kbounce-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kbounce.xpm b/ubuntu/_base/kdegames/debian/icons/kbounce.xpm
index e4afdecc7..e4afdecc7 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kbounce.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kbounce.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kenolaba-16.xpm b/ubuntu/_base/kdegames/debian/icons/kenolaba-16.xpm
index 413891e6f..413891e6f 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kenolaba-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kenolaba-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kenolaba.xpm b/ubuntu/_base/kdegames/debian/icons/kenolaba.xpm
index 84a592a58..84a592a58 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kenolaba.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kenolaba.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kfouleggs-16.xpm b/ubuntu/_base/kdegames/debian/icons/kfouleggs-16.xpm
index 2c94b7951..2c94b7951 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kfouleggs-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kfouleggs-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kfouleggs.xpm b/ubuntu/_base/kdegames/debian/icons/kfouleggs.xpm
index 2d4b0458d..2d4b0458d 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kfouleggs.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kfouleggs.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kgoldrunner-16.xpm b/ubuntu/_base/kdegames/debian/icons/kgoldrunner-16.xpm
index 16c4e1f92..16c4e1f92 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kgoldrunner-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kgoldrunner-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kgoldrunner.xpm b/ubuntu/_base/kdegames/debian/icons/kgoldrunner.xpm
index cba7cb4a2..cba7cb4a2 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kgoldrunner.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kgoldrunner.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kjumpingcube-16.xpm b/ubuntu/_base/kdegames/debian/icons/kjumpingcube-16.xpm
index 384b87ba1..384b87ba1 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kjumpingcube-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kjumpingcube-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kjumpingcube.xpm b/ubuntu/_base/kdegames/debian/icons/kjumpingcube.xpm
index 147c70579..147c70579 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kjumpingcube.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kjumpingcube.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/klickety-16.xpm b/ubuntu/_base/kdegames/debian/icons/klickety-16.xpm
index 8ab2f2cca..8ab2f2cca 100644
--- a/ubuntu/maverick/kdegames/debian/icons/klickety-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/klickety-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/klickety.xpm b/ubuntu/_base/kdegames/debian/icons/klickety.xpm
index 65929998d..65929998d 100644
--- a/ubuntu/maverick/kdegames/debian/icons/klickety.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/klickety.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/klines-16.xpm b/ubuntu/_base/kdegames/debian/icons/klines-16.xpm
index a8142f79a..a8142f79a 100644
--- a/ubuntu/maverick/kdegames/debian/icons/klines-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/klines-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/klines.xpm b/ubuntu/_base/kdegames/debian/icons/klines.xpm
index a25489ec7..a25489ec7 100644
--- a/ubuntu/maverick/kdegames/debian/icons/klines.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/klines.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kmahjongg-16.xpm b/ubuntu/_base/kdegames/debian/icons/kmahjongg-16.xpm
index 3c094c76e..3c094c76e 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kmahjongg-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kmahjongg-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kmahjongg.xpm b/ubuntu/_base/kdegames/debian/icons/kmahjongg.xpm
index 7fcd7db9b..7fcd7db9b 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kmahjongg.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kmahjongg.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kmines-16.xpm b/ubuntu/_base/kdegames/debian/icons/kmines-16.xpm
index a6f31a084..a6f31a084 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kmines-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kmines-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kmines.xpm b/ubuntu/_base/kdegames/debian/icons/kmines.xpm
index 39cbdf984..39cbdf984 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kmines.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kmines.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/knetwalk-16.xpm b/ubuntu/_base/kdegames/debian/icons/knetwalk-16.xpm
index f923a4ff3..f923a4ff3 100644
--- a/ubuntu/maverick/kdegames/debian/icons/knetwalk-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/knetwalk-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/knetwalk.xpm b/ubuntu/_base/kdegames/debian/icons/knetwalk.xpm
index e0aff6cc6..e0aff6cc6 100644
--- a/ubuntu/maverick/kdegames/debian/icons/knetwalk.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/knetwalk.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kolf-16.xpm b/ubuntu/_base/kdegames/debian/icons/kolf-16.xpm
index 94b1f4fc5..94b1f4fc5 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kolf-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kolf-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kolf.xpm b/ubuntu/_base/kdegames/debian/icons/kolf.xpm
index 329420de4..329420de4 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kolf.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kolf.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/konquest-16.xpm b/ubuntu/_base/kdegames/debian/icons/konquest-16.xpm
index b2e9e24e0..b2e9e24e0 100644
--- a/ubuntu/maverick/kdegames/debian/icons/konquest-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/konquest-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/konquest.xpm b/ubuntu/_base/kdegames/debian/icons/konquest.xpm
index 127f8d9f7..127f8d9f7 100644
--- a/ubuntu/maverick/kdegames/debian/icons/konquest.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/konquest.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kpat-16.xpm b/ubuntu/_base/kdegames/debian/icons/kpat-16.xpm
index 42d177db4..42d177db4 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kpat-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kpat-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kpat.xpm b/ubuntu/_base/kdegames/debian/icons/kpat.xpm
index 251453768..251453768 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kpat.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kpat.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kpoker-16.xpm b/ubuntu/_base/kdegames/debian/icons/kpoker-16.xpm
index 69e381b74..69e381b74 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kpoker-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kpoker-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kpoker.xpm b/ubuntu/_base/kdegames/debian/icons/kpoker.xpm
index dda5699a5..dda5699a5 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kpoker.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kpoker.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kreversi-16.xpm b/ubuntu/_base/kdegames/debian/icons/kreversi-16.xpm
index 47f24e1fd..47f24e1fd 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kreversi-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kreversi-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kreversi.xpm b/ubuntu/_base/kdegames/debian/icons/kreversi.xpm
index 01bb944e1..01bb944e1 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kreversi.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kreversi.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksame-16.xpm b/ubuntu/_base/kdegames/debian/icons/ksame-16.xpm
index 0981cde6d..0981cde6d 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksame-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksame-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksame.xpm b/ubuntu/_base/kdegames/debian/icons/ksame.xpm
index 9d899f425..9d899f425 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksame.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksame.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kshisen-16.xpm b/ubuntu/_base/kdegames/debian/icons/kshisen-16.xpm
index f9d1f3c3c..f9d1f3c3c 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kshisen-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kshisen-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kshisen.xpm b/ubuntu/_base/kdegames/debian/icons/kshisen.xpm
index 0e78d3b92..0e78d3b92 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kshisen.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kshisen.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksirtet-16.xpm b/ubuntu/_base/kdegames/debian/icons/ksirtet-16.xpm
index 8c5f2bf6a..8c5f2bf6a 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksirtet-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksirtet-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksirtet.xpm b/ubuntu/_base/kdegames/debian/icons/ksirtet.xpm
index 708a1f89e..708a1f89e 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksirtet.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksirtet.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksmiletris-16.xpm b/ubuntu/_base/kdegames/debian/icons/ksmiletris-16.xpm
index ce6fbe8a9..ce6fbe8a9 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksmiletris-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksmiletris-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksmiletris.xpm b/ubuntu/_base/kdegames/debian/icons/ksmiletris.xpm
index c7832aacd..c7832aacd 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksmiletris.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksmiletris.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksnake-16.xpm b/ubuntu/_base/kdegames/debian/icons/ksnake-16.xpm
index 409b95396..409b95396 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksnake-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksnake-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksnake.xpm b/ubuntu/_base/kdegames/debian/icons/ksnake.xpm
index 339e31d8a..339e31d8a 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksnake.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksnake.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksokoban-16.xpm b/ubuntu/_base/kdegames/debian/icons/ksokoban-16.xpm
index 0424d09f5..0424d09f5 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksokoban-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksokoban-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ksokoban.xpm b/ubuntu/_base/kdegames/debian/icons/ksokoban.xpm
index 6b9c52381..6b9c52381 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ksokoban.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ksokoban.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kspaceduel-16.xpm b/ubuntu/_base/kdegames/debian/icons/kspaceduel-16.xpm
index 911acb1cf..911acb1cf 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kspaceduel-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kspaceduel-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kspaceduel.xpm b/ubuntu/_base/kdegames/debian/icons/kspaceduel.xpm
index 0529f7ac5..0529f7ac5 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kspaceduel.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kspaceduel.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ktron-16.xpm b/ubuntu/_base/kdegames/debian/icons/ktron-16.xpm
index abaf26411..abaf26411 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ktron-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ktron-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ktron.xpm b/ubuntu/_base/kdegames/debian/icons/ktron.xpm
index 346a45d5e..346a45d5e 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ktron.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ktron.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ktuberling-16.xpm b/ubuntu/_base/kdegames/debian/icons/ktuberling-16.xpm
index 94ec16e57..94ec16e57 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ktuberling-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ktuberling-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/ktuberling.xpm b/ubuntu/_base/kdegames/debian/icons/ktuberling.xpm
index 8d3240633..8d3240633 100644
--- a/ubuntu/maverick/kdegames/debian/icons/ktuberling.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/ktuberling.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kwin4-16.xpm b/ubuntu/_base/kdegames/debian/icons/kwin4-16.xpm
index 2bad59cf8..2bad59cf8 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kwin4-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kwin4-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/kwin4.xpm b/ubuntu/_base/kdegames/debian/icons/kwin4.xpm
index 43b466224..43b466224 100644
--- a/ubuntu/maverick/kdegames/debian/icons/kwin4.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/kwin4.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/lskat-16.xpm b/ubuntu/_base/kdegames/debian/icons/lskat-16.xpm
index 8fb679d0e..8fb679d0e 100644
--- a/ubuntu/maverick/kdegames/debian/icons/lskat-16.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/lskat-16.xpm
diff --git a/ubuntu/maverick/kdegames/debian/icons/lskat.xpm b/ubuntu/_base/kdegames/debian/icons/lskat.xpm
index e24ed07ef..e24ed07ef 100644
--- a/ubuntu/maverick/kdegames/debian/icons/lskat.xpm
+++ b/ubuntu/_base/kdegames/debian/icons/lskat.xpm
diff --git a/ubuntu/maverick/kdegames/debian/kasteroids-trinity.install b/ubuntu/_base/kdegames/debian/kasteroids-trinity.install
index ae24b2a78..ae24b2a78 100644
--- a/ubuntu/maverick/kdegames/debian/kasteroids-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kasteroids-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kasteroids-trinity.links b/ubuntu/_base/kdegames/debian/kasteroids-trinity.links
index 5e93c0fe3..5e93c0fe3 100644
--- a/ubuntu/maverick/kdegames/debian/kasteroids-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kasteroids-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kasteroids-trinity.manpages b/ubuntu/_base/kdegames/debian/kasteroids-trinity.manpages
index 3155d6e18..3155d6e18 100644
--- a/ubuntu/maverick/kdegames/debian/kasteroids-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kasteroids-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kasteroids-trinity.menu b/ubuntu/_base/kdegames/debian/kasteroids-trinity.menu
index e8eb57662..e8eb57662 100644
--- a/ubuntu/maverick/kdegames/debian/kasteroids-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kasteroids-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/katomic-trinity.install b/ubuntu/_base/kdegames/debian/katomic-trinity.install
index fca842275..fca842275 100644
--- a/ubuntu/maverick/kdegames/debian/katomic-trinity.install
+++ b/ubuntu/_base/kdegames/debian/katomic-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/katomic-trinity.links b/ubuntu/_base/kdegames/debian/katomic-trinity.links
index e254acaa5..e254acaa5 100644
--- a/ubuntu/maverick/kdegames/debian/katomic-trinity.links
+++ b/ubuntu/_base/kdegames/debian/katomic-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/katomic-trinity.manpages b/ubuntu/_base/kdegames/debian/katomic-trinity.manpages
index fb19d0803..fb19d0803 100644
--- a/ubuntu/maverick/kdegames/debian/katomic-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/katomic-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/katomic-trinity.menu b/ubuntu/_base/kdegames/debian/katomic-trinity.menu
index cf426c63e..cf426c63e 100644
--- a/ubuntu/maverick/kdegames/debian/katomic-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/katomic-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kbackgammon-trinity.install b/ubuntu/_base/kdegames/debian/kbackgammon-trinity.install
index 41b81b789..41b81b789 100644
--- a/ubuntu/maverick/kdegames/debian/kbackgammon-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kbackgammon-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kbackgammon-trinity.links b/ubuntu/_base/kdegames/debian/kbackgammon-trinity.links
index 0aeb5b85c..0aeb5b85c 100644
--- a/ubuntu/maverick/kdegames/debian/kbackgammon-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kbackgammon-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kbackgammon-trinity.manpages b/ubuntu/_base/kdegames/debian/kbackgammon-trinity.manpages
index 62d51aced..62d51aced 100644
--- a/ubuntu/maverick/kdegames/debian/kbackgammon-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kbackgammon-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kbackgammon-trinity.menu b/ubuntu/_base/kdegames/debian/kbackgammon-trinity.menu
index bb187d03a..bb187d03a 100644
--- a/ubuntu/maverick/kdegames/debian/kbackgammon-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kbackgammon-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kbattleship-trinity.install b/ubuntu/_base/kdegames/debian/kbattleship-trinity.install
index 68a6e39ca..68a6e39ca 100644
--- a/ubuntu/maverick/kdegames/debian/kbattleship-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kbattleship-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kbattleship-trinity.links b/ubuntu/_base/kdegames/debian/kbattleship-trinity.links
index 5db9ac11d..5db9ac11d 100644
--- a/ubuntu/maverick/kdegames/debian/kbattleship-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kbattleship-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kbattleship-trinity.manpages b/ubuntu/_base/kdegames/debian/kbattleship-trinity.manpages
index 87cb14840..87cb14840 100644
--- a/ubuntu/maverick/kdegames/debian/kbattleship-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kbattleship-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kbattleship-trinity.menu b/ubuntu/_base/kdegames/debian/kbattleship-trinity.menu
index f22f356a0..f22f356a0 100644
--- a/ubuntu/maverick/kdegames/debian/kbattleship-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kbattleship-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kblackbox-trinity.install b/ubuntu/_base/kdegames/debian/kblackbox-trinity.install
index d801df8cc..d801df8cc 100644
--- a/ubuntu/maverick/kdegames/debian/kblackbox-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kblackbox-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kblackbox-trinity.links b/ubuntu/_base/kdegames/debian/kblackbox-trinity.links
index 13ff89735..13ff89735 100644
--- a/ubuntu/maverick/kdegames/debian/kblackbox-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kblackbox-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kblackbox-trinity.manpages b/ubuntu/_base/kdegames/debian/kblackbox-trinity.manpages
index 768db9c03..768db9c03 100644
--- a/ubuntu/maverick/kdegames/debian/kblackbox-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kblackbox-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kblackbox-trinity.menu b/ubuntu/_base/kdegames/debian/kblackbox-trinity.menu
index 008eaf055..008eaf055 100644
--- a/ubuntu/maverick/kdegames/debian/kblackbox-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kblackbox-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kbounce-trinity.install b/ubuntu/_base/kdegames/debian/kbounce-trinity.install
index 7c9bac7b3..7c9bac7b3 100644
--- a/ubuntu/maverick/kdegames/debian/kbounce-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kbounce-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kbounce-trinity.links b/ubuntu/_base/kdegames/debian/kbounce-trinity.links
index 5e91fe04e..5e91fe04e 100644
--- a/ubuntu/maverick/kdegames/debian/kbounce-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kbounce-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kbounce-trinity.manpages b/ubuntu/_base/kdegames/debian/kbounce-trinity.manpages
index dd3a2fdfa..dd3a2fdfa 100644
--- a/ubuntu/maverick/kdegames/debian/kbounce-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kbounce-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kbounce-trinity.menu b/ubuntu/_base/kdegames/debian/kbounce-trinity.menu
index c4763e539..c4763e539 100644
--- a/ubuntu/maverick/kdegames/debian/kbounce-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kbounce-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-card-data-trinity.install b/ubuntu/_base/kdegames/debian/kdegames-card-data-trinity.install
index 32fae70ae..32fae70ae 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-card-data-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kdegames-card-data-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.atlantik b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.atlantik
index fba9537c5..fba9537c5 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.atlantik
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.atlantik
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kasteroids b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kasteroids
index 851c85085..851c85085 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kasteroids
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kasteroids
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.katomic b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.katomic
index 67b67a044..67b67a044 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.katomic
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.katomic
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon
index 63cebafb1..63cebafb1 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kbackgammon
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kbattleship b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kbattleship
index 8a1b92637..8a1b92637 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kbattleship
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kbattleship
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kblackbox b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kblackbox
index ceace853f..ceace853f 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kblackbox
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kblackbox
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kbounce b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kbounce
index 6b65d2382..6b65d2382 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kbounce
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kbounce
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kenolaba b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kenolaba
index 67c54bbb1..67c54bbb1 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kenolaba
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kenolaba
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs
index 0f393c64c..0f393c64c 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kfouleggs
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner
index 4dc7f17bd..4dc7f17bd 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kgoldrunner
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube
index 2d665f0bf..2d665f0bf 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kjumpingcube
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.klines b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.klines
index 362544594..362544594 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.klines
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.klines
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kmahjongg b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kmahjongg
index 7d8a22144..7d8a22144 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kmahjongg
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kmahjongg
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kmines b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kmines
index a2c446270..a2c446270 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kmines
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kmines
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kolf b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kolf
index 5cc76ed65..5cc76ed65 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kolf
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kolf
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.konquest b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.konquest
index 15e9cfaf2..15e9cfaf2 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.konquest
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.konquest
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kpat b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kpat
index 32a2da72d..32a2da72d 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kpat
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kpat
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kpoker b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kpoker
index 0d41124e6..0d41124e6 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kpoker
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kpoker
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kreversi b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kreversi
index c2614c666..c2614c666 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kreversi
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kreversi
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ksame b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ksame
index f71b2f351..f71b2f351 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ksame
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ksame
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kshisen b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kshisen
index 6a159dad1..6a159dad1 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kshisen
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kshisen
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ksirtet b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ksirtet
index e09ac5c89..e09ac5c89 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ksirtet
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ksirtet
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ksnake b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ksnake
index fc3daf3a2..fc3daf3a2 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ksnake
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ksnake
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ksokoban b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ksokoban
index 152c20ea0..152c20ea0 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ksokoban
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ksokoban
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel
index 34af6ca0b..34af6ca0b 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kspaceduel
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ktron b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ktron
index 30290f9bc..30290f9bc 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ktron
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ktron
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ktuberling b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ktuberling
index 1f2ce6736..1f2ce6736 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.ktuberling
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.ktuberling
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kwin4 b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kwin4
index 18c186bef..18c186bef 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.kwin4
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.kwin4
diff --git a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.lskat b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.lskat
index 2516f5efc..2516f5efc 100644
--- a/ubuntu/maverick/kdegames/debian/kdegames-doc-html.doc-base.lskat
+++ b/ubuntu/_base/kdegames/debian/kdegames-doc-html.doc-base.lskat
diff --git a/ubuntu/maverick/kdegames/debian/kenolaba-trinity.install b/ubuntu/_base/kdegames/debian/kenolaba-trinity.install
index 121e8ae52..121e8ae52 100644
--- a/ubuntu/maverick/kdegames/debian/kenolaba-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kenolaba-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kenolaba-trinity.links b/ubuntu/_base/kdegames/debian/kenolaba-trinity.links
index 03980edc3..03980edc3 100644
--- a/ubuntu/maverick/kdegames/debian/kenolaba-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kenolaba-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kenolaba-trinity.manpages b/ubuntu/_base/kdegames/debian/kenolaba-trinity.manpages
index d39200c68..d39200c68 100644
--- a/ubuntu/maverick/kdegames/debian/kenolaba-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kenolaba-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kenolaba-trinity.menu b/ubuntu/_base/kdegames/debian/kenolaba-trinity.menu
index 92c2eafb4..92c2eafb4 100644
--- a/ubuntu/maverick/kdegames/debian/kenolaba-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kenolaba-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kfouleggs-trinity.install b/ubuntu/_base/kdegames/debian/kfouleggs-trinity.install
index 4ceaf21df..4ceaf21df 100644
--- a/ubuntu/maverick/kdegames/debian/kfouleggs-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kfouleggs-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kfouleggs-trinity.links b/ubuntu/_base/kdegames/debian/kfouleggs-trinity.links
index 5d1835277..5d1835277 100644
--- a/ubuntu/maverick/kdegames/debian/kfouleggs-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kfouleggs-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kfouleggs-trinity.manpages b/ubuntu/_base/kdegames/debian/kfouleggs-trinity.manpages
index 033192e89..033192e89 100644
--- a/ubuntu/maverick/kdegames/debian/kfouleggs-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kfouleggs-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kfouleggs-trinity.menu b/ubuntu/_base/kdegames/debian/kfouleggs-trinity.menu
index 0b5146d3d..0b5146d3d 100644
--- a/ubuntu/maverick/kdegames/debian/kfouleggs-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kfouleggs-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kgoldrunner-trinity.install b/ubuntu/_base/kdegames/debian/kgoldrunner-trinity.install
index 5283b997f..5283b997f 100644
--- a/ubuntu/maverick/kdegames/debian/kgoldrunner-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kgoldrunner-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kgoldrunner-trinity.links b/ubuntu/_base/kdegames/debian/kgoldrunner-trinity.links
index 2a1164f25..2a1164f25 100644
--- a/ubuntu/maverick/kdegames/debian/kgoldrunner-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kgoldrunner-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kgoldrunner-trinity.manpages b/ubuntu/_base/kdegames/debian/kgoldrunner-trinity.manpages
index c352557d4..c352557d4 100644
--- a/ubuntu/maverick/kdegames/debian/kgoldrunner-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kgoldrunner-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kgoldrunner-trinity.menu b/ubuntu/_base/kdegames/debian/kgoldrunner-trinity.menu
index 879d0fa0d..879d0fa0d 100644
--- a/ubuntu/maverick/kdegames/debian/kgoldrunner-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kgoldrunner-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kjumpingcube-trinity.install b/ubuntu/_base/kdegames/debian/kjumpingcube-trinity.install
index c5532b2f6..c5532b2f6 100644
--- a/ubuntu/maverick/kdegames/debian/kjumpingcube-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kjumpingcube-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kjumpingcube-trinity.links b/ubuntu/_base/kdegames/debian/kjumpingcube-trinity.links
index 037ef6838..037ef6838 100644
--- a/ubuntu/maverick/kdegames/debian/kjumpingcube-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kjumpingcube-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kjumpingcube-trinity.manpages b/ubuntu/_base/kdegames/debian/kjumpingcube-trinity.manpages
index 3dcfe7015..3dcfe7015 100644
--- a/ubuntu/maverick/kdegames/debian/kjumpingcube-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kjumpingcube-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kjumpingcube-trinity.menu b/ubuntu/_base/kdegames/debian/kjumpingcube-trinity.menu
index 8c3d8376b..8c3d8376b 100644
--- a/ubuntu/maverick/kdegames/debian/kjumpingcube-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kjumpingcube-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/klickety-trinity.install b/ubuntu/_base/kdegames/debian/klickety-trinity.install
index 65e89710d..65e89710d 100644
--- a/ubuntu/maverick/kdegames/debian/klickety-trinity.install
+++ b/ubuntu/_base/kdegames/debian/klickety-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/klickety-trinity.links b/ubuntu/_base/kdegames/debian/klickety-trinity.links
index f281e2ba6..f281e2ba6 100644
--- a/ubuntu/maverick/kdegames/debian/klickety-trinity.links
+++ b/ubuntu/_base/kdegames/debian/klickety-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/klickety-trinity.manpages b/ubuntu/_base/kdegames/debian/klickety-trinity.manpages
index 5c003f445..5c003f445 100644
--- a/ubuntu/maverick/kdegames/debian/klickety-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/klickety-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/klickety-trinity.menu b/ubuntu/_base/kdegames/debian/klickety-trinity.menu
index e18881c82..e18881c82 100644
--- a/ubuntu/maverick/kdegames/debian/klickety-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/klickety-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/klines-trinity.install b/ubuntu/_base/kdegames/debian/klines-trinity.install
index ba07a9752..ba07a9752 100644
--- a/ubuntu/maverick/kdegames/debian/klines-trinity.install
+++ b/ubuntu/_base/kdegames/debian/klines-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/klines-trinity.links b/ubuntu/_base/kdegames/debian/klines-trinity.links
index 2b00aeb3e..2b00aeb3e 100644
--- a/ubuntu/maverick/kdegames/debian/klines-trinity.links
+++ b/ubuntu/_base/kdegames/debian/klines-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/klines-trinity.manpages b/ubuntu/_base/kdegames/debian/klines-trinity.manpages
index 2a4381d37..2a4381d37 100644
--- a/ubuntu/maverick/kdegames/debian/klines-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/klines-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/klines-trinity.menu b/ubuntu/_base/kdegames/debian/klines-trinity.menu
index 36fa06ff7..36fa06ff7 100644
--- a/ubuntu/maverick/kdegames/debian/klines-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/klines-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kmahjongg-trinity.install b/ubuntu/_base/kdegames/debian/kmahjongg-trinity.install
index 19b225795..19b225795 100644
--- a/ubuntu/maverick/kdegames/debian/kmahjongg-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kmahjongg-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kmahjongg-trinity.manpages b/ubuntu/_base/kdegames/debian/kmahjongg-trinity.manpages
index e951b29cc..e951b29cc 100644
--- a/ubuntu/maverick/kdegames/debian/kmahjongg-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kmahjongg-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kmahjongg-trinity.menu b/ubuntu/_base/kdegames/debian/kmahjongg-trinity.menu
index a69063cfe..a69063cfe 100644
--- a/ubuntu/maverick/kdegames/debian/kmahjongg-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kmahjongg-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kmines-trinity.install b/ubuntu/_base/kdegames/debian/kmines-trinity.install
index bcf5ee654..bcf5ee654 100644
--- a/ubuntu/maverick/kdegames/debian/kmines-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kmines-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kmines-trinity.links b/ubuntu/_base/kdegames/debian/kmines-trinity.links
index d1d5a86fd..d1d5a86fd 100644
--- a/ubuntu/maverick/kdegames/debian/kmines-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kmines-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kmines-trinity.manpages b/ubuntu/_base/kdegames/debian/kmines-trinity.manpages
index f6100c64c..f6100c64c 100644
--- a/ubuntu/maverick/kdegames/debian/kmines-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kmines-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kmines-trinity.menu b/ubuntu/_base/kdegames/debian/kmines-trinity.menu
index e74163e9d..e74163e9d 100644
--- a/ubuntu/maverick/kdegames/debian/kmines-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kmines-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/knetwalk-trinity.install b/ubuntu/_base/kdegames/debian/knetwalk-trinity.install
index a3a7adf42..a3a7adf42 100644
--- a/ubuntu/maverick/kdegames/debian/knetwalk-trinity.install
+++ b/ubuntu/_base/kdegames/debian/knetwalk-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/knetwalk-trinity.manpages b/ubuntu/_base/kdegames/debian/knetwalk-trinity.manpages
index e43789f1c..e43789f1c 100644
--- a/ubuntu/maverick/kdegames/debian/knetwalk-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/knetwalk-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/knetwalk-trinity.menu b/ubuntu/_base/kdegames/debian/knetwalk-trinity.menu
index 8e67087bc..8e67087bc 100644
--- a/ubuntu/maverick/kdegames/debian/knetwalk-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/knetwalk-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kolf-trinity-dev.install b/ubuntu/_base/kdegames/debian/kolf-trinity-dev.install
index 4da86d1b2..4da86d1b2 100644
--- a/ubuntu/maverick/kdegames/debian/kolf-trinity-dev.install
+++ b/ubuntu/_base/kdegames/debian/kolf-trinity-dev.install
diff --git a/ubuntu/maverick/kdegames/debian/kolf-trinity.install b/ubuntu/_base/kdegames/debian/kolf-trinity.install
index cd186b0b5..cd186b0b5 100644
--- a/ubuntu/maverick/kdegames/debian/kolf-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kolf-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kolf-trinity.links b/ubuntu/_base/kdegames/debian/kolf-trinity.links
index 8f0f830f5..8f0f830f5 100644
--- a/ubuntu/maverick/kdegames/debian/kolf-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kolf-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kolf-trinity.manpages b/ubuntu/_base/kdegames/debian/kolf-trinity.manpages
index ddc5af1a2..ddc5af1a2 100644
--- a/ubuntu/maverick/kdegames/debian/kolf-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kolf-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kolf-trinity.menu b/ubuntu/_base/kdegames/debian/kolf-trinity.menu
index c77a47477..c77a47477 100644
--- a/ubuntu/maverick/kdegames/debian/kolf-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kolf-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/konquest-trinity.install b/ubuntu/_base/kdegames/debian/konquest-trinity.install
index d858d2e29..d858d2e29 100644
--- a/ubuntu/maverick/kdegames/debian/konquest-trinity.install
+++ b/ubuntu/_base/kdegames/debian/konquest-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/konquest-trinity.links b/ubuntu/_base/kdegames/debian/konquest-trinity.links
index e57a10549..e57a10549 100644
--- a/ubuntu/maverick/kdegames/debian/konquest-trinity.links
+++ b/ubuntu/_base/kdegames/debian/konquest-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/konquest-trinity.manpages b/ubuntu/_base/kdegames/debian/konquest-trinity.manpages
index 75e03a8c5..75e03a8c5 100644
--- a/ubuntu/maverick/kdegames/debian/konquest-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/konquest-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/konquest-trinity.menu b/ubuntu/_base/kdegames/debian/konquest-trinity.menu
index 9f2056609..9f2056609 100644
--- a/ubuntu/maverick/kdegames/debian/konquest-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/konquest-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kpat-trinity.install b/ubuntu/_base/kdegames/debian/kpat-trinity.install
index 1d7f45758..1d7f45758 100644
--- a/ubuntu/maverick/kdegames/debian/kpat-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kpat-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kpat-trinity.links b/ubuntu/_base/kdegames/debian/kpat-trinity.links
index dbc291066..dbc291066 100644
--- a/ubuntu/maverick/kdegames/debian/kpat-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kpat-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kpat-trinity.manpages b/ubuntu/_base/kdegames/debian/kpat-trinity.manpages
index d1da72ae5..d1da72ae5 100644
--- a/ubuntu/maverick/kdegames/debian/kpat-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kpat-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kpat-trinity.menu b/ubuntu/_base/kdegames/debian/kpat-trinity.menu
index 84fc42bef..84fc42bef 100644
--- a/ubuntu/maverick/kdegames/debian/kpat-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kpat-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kpoker-trinity.install b/ubuntu/_base/kdegames/debian/kpoker-trinity.install
index 0f499209c..0f499209c 100644
--- a/ubuntu/maverick/kdegames/debian/kpoker-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kpoker-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kpoker-trinity.links b/ubuntu/_base/kdegames/debian/kpoker-trinity.links
index 8d789b45e..8d789b45e 100644
--- a/ubuntu/maverick/kdegames/debian/kpoker-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kpoker-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kpoker-trinity.manpages b/ubuntu/_base/kdegames/debian/kpoker-trinity.manpages
index 796a3f8bd..796a3f8bd 100644
--- a/ubuntu/maverick/kdegames/debian/kpoker-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kpoker-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kpoker-trinity.menu b/ubuntu/_base/kdegames/debian/kpoker-trinity.menu
index 56ef86035..56ef86035 100644
--- a/ubuntu/maverick/kdegames/debian/kpoker-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kpoker-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kreversi-trinity.install b/ubuntu/_base/kdegames/debian/kreversi-trinity.install
index 981e8d7b0..981e8d7b0 100644
--- a/ubuntu/maverick/kdegames/debian/kreversi-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kreversi-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kreversi-trinity.links b/ubuntu/_base/kdegames/debian/kreversi-trinity.links
index ad5f17a8f..ad5f17a8f 100644
--- a/ubuntu/maverick/kdegames/debian/kreversi-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kreversi-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kreversi-trinity.manpages b/ubuntu/_base/kdegames/debian/kreversi-trinity.manpages
index 70897c051..70897c051 100644
--- a/ubuntu/maverick/kdegames/debian/kreversi-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kreversi-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kreversi-trinity.menu b/ubuntu/_base/kdegames/debian/kreversi-trinity.menu
index aa29af9c4..aa29af9c4 100644
--- a/ubuntu/maverick/kdegames/debian/kreversi-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kreversi-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/ksame-trinity.install b/ubuntu/_base/kdegames/debian/ksame-trinity.install
index 1451960e7..1451960e7 100644
--- a/ubuntu/maverick/kdegames/debian/ksame-trinity.install
+++ b/ubuntu/_base/kdegames/debian/ksame-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/ksame-trinity.links b/ubuntu/_base/kdegames/debian/ksame-trinity.links
index 09425a104..09425a104 100644
--- a/ubuntu/maverick/kdegames/debian/ksame-trinity.links
+++ b/ubuntu/_base/kdegames/debian/ksame-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/ksame-trinity.manpages b/ubuntu/_base/kdegames/debian/ksame-trinity.manpages
index fcb8ade0e..fcb8ade0e 100644
--- a/ubuntu/maverick/kdegames/debian/ksame-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/ksame-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/ksame-trinity.menu b/ubuntu/_base/kdegames/debian/ksame-trinity.menu
index 47dfe1141..47dfe1141 100644
--- a/ubuntu/maverick/kdegames/debian/ksame-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/ksame-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kshisen-trinity.install b/ubuntu/_base/kdegames/debian/kshisen-trinity.install
index b302633c0..b302633c0 100644
--- a/ubuntu/maverick/kdegames/debian/kshisen-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kshisen-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kshisen-trinity.links b/ubuntu/_base/kdegames/debian/kshisen-trinity.links
index ae00c9136..ae00c9136 100644
--- a/ubuntu/maverick/kdegames/debian/kshisen-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kshisen-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kshisen-trinity.manpages b/ubuntu/_base/kdegames/debian/kshisen-trinity.manpages
index c1a26757e..c1a26757e 100644
--- a/ubuntu/maverick/kdegames/debian/kshisen-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kshisen-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kshisen-trinity.menu b/ubuntu/_base/kdegames/debian/kshisen-trinity.menu
index cc49eb3f2..cc49eb3f2 100644
--- a/ubuntu/maverick/kdegames/debian/kshisen-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kshisen-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/ksirtet-trinity.install b/ubuntu/_base/kdegames/debian/ksirtet-trinity.install
index 2de50860e..2de50860e 100644
--- a/ubuntu/maverick/kdegames/debian/ksirtet-trinity.install
+++ b/ubuntu/_base/kdegames/debian/ksirtet-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/ksirtet-trinity.links b/ubuntu/_base/kdegames/debian/ksirtet-trinity.links
index 220128ee9..220128ee9 100644
--- a/ubuntu/maverick/kdegames/debian/ksirtet-trinity.links
+++ b/ubuntu/_base/kdegames/debian/ksirtet-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/ksirtet-trinity.manpages b/ubuntu/_base/kdegames/debian/ksirtet-trinity.manpages
index 08a43dd5a..08a43dd5a 100644
--- a/ubuntu/maverick/kdegames/debian/ksirtet-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/ksirtet-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/ksirtet-trinity.menu b/ubuntu/_base/kdegames/debian/ksirtet-trinity.menu
index bdd1f23d1..bdd1f23d1 100644
--- a/ubuntu/maverick/kdegames/debian/ksirtet-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/ksirtet-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/ksmiletris-trinity.install b/ubuntu/_base/kdegames/debian/ksmiletris-trinity.install
index 2db54f7ef..2db54f7ef 100644
--- a/ubuntu/maverick/kdegames/debian/ksmiletris-trinity.install
+++ b/ubuntu/_base/kdegames/debian/ksmiletris-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/ksmiletris-trinity.manpages b/ubuntu/_base/kdegames/debian/ksmiletris-trinity.manpages
index 7a07168e3..7a07168e3 100644
--- a/ubuntu/maverick/kdegames/debian/ksmiletris-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/ksmiletris-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/ksmiletris-trinity.menu b/ubuntu/_base/kdegames/debian/ksmiletris-trinity.menu
index 7df7ce4be..7df7ce4be 100644
--- a/ubuntu/maverick/kdegames/debian/ksmiletris-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/ksmiletris-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/ksnake-trinity.install b/ubuntu/_base/kdegames/debian/ksnake-trinity.install
index 7f447dedb..7f447dedb 100644
--- a/ubuntu/maverick/kdegames/debian/ksnake-trinity.install
+++ b/ubuntu/_base/kdegames/debian/ksnake-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/ksnake-trinity.links b/ubuntu/_base/kdegames/debian/ksnake-trinity.links
index a790e936a..a790e936a 100644
--- a/ubuntu/maverick/kdegames/debian/ksnake-trinity.links
+++ b/ubuntu/_base/kdegames/debian/ksnake-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/ksnake-trinity.manpages b/ubuntu/_base/kdegames/debian/ksnake-trinity.manpages
index b477dd190..b477dd190 100644
--- a/ubuntu/maverick/kdegames/debian/ksnake-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/ksnake-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/ksnake-trinity.menu b/ubuntu/_base/kdegames/debian/ksnake-trinity.menu
index 621bb2c45..621bb2c45 100644
--- a/ubuntu/maverick/kdegames/debian/ksnake-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/ksnake-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/ksokoban-trinity.install b/ubuntu/_base/kdegames/debian/ksokoban-trinity.install
index 00648dd8b..00648dd8b 100644
--- a/ubuntu/maverick/kdegames/debian/ksokoban-trinity.install
+++ b/ubuntu/_base/kdegames/debian/ksokoban-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/ksokoban-trinity.links b/ubuntu/_base/kdegames/debian/ksokoban-trinity.links
index 9930c3548..9930c3548 100644
--- a/ubuntu/maverick/kdegames/debian/ksokoban-trinity.links
+++ b/ubuntu/_base/kdegames/debian/ksokoban-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/ksokoban-trinity.manpages b/ubuntu/_base/kdegames/debian/ksokoban-trinity.manpages
index 502ee9496..502ee9496 100644
--- a/ubuntu/maverick/kdegames/debian/ksokoban-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/ksokoban-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/ksokoban-trinity.menu b/ubuntu/_base/kdegames/debian/ksokoban-trinity.menu
index 9477f6aad..9477f6aad 100644
--- a/ubuntu/maverick/kdegames/debian/ksokoban-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/ksokoban-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kspaceduel-trinity.install b/ubuntu/_base/kdegames/debian/kspaceduel-trinity.install
index 559f89cdc..559f89cdc 100644
--- a/ubuntu/maverick/kdegames/debian/kspaceduel-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kspaceduel-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kspaceduel-trinity.links b/ubuntu/_base/kdegames/debian/kspaceduel-trinity.links
index 0182b926b..0182b926b 100644
--- a/ubuntu/maverick/kdegames/debian/kspaceduel-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kspaceduel-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kspaceduel-trinity.manpages b/ubuntu/_base/kdegames/debian/kspaceduel-trinity.manpages
index 8a48d9286..8a48d9286 100644
--- a/ubuntu/maverick/kdegames/debian/kspaceduel-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kspaceduel-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kspaceduel-trinity.menu b/ubuntu/_base/kdegames/debian/kspaceduel-trinity.menu
index d42077726..d42077726 100644
--- a/ubuntu/maverick/kdegames/debian/kspaceduel-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kspaceduel-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/ktron-trinity.install b/ubuntu/_base/kdegames/debian/ktron-trinity.install
index 05bf663a5..05bf663a5 100644
--- a/ubuntu/maverick/kdegames/debian/ktron-trinity.install
+++ b/ubuntu/_base/kdegames/debian/ktron-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/ktron-trinity.links b/ubuntu/_base/kdegames/debian/ktron-trinity.links
index 1d133ef86..1d133ef86 100644
--- a/ubuntu/maverick/kdegames/debian/ktron-trinity.links
+++ b/ubuntu/_base/kdegames/debian/ktron-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/ktron-trinity.manpages b/ubuntu/_base/kdegames/debian/ktron-trinity.manpages
index c34c3e0bf..c34c3e0bf 100644
--- a/ubuntu/maverick/kdegames/debian/ktron-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/ktron-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/ktron-trinity.menu b/ubuntu/_base/kdegames/debian/ktron-trinity.menu
index a2c4c5466..a2c4c5466 100644
--- a/ubuntu/maverick/kdegames/debian/ktron-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/ktron-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/ktuberling-trinity.install b/ubuntu/_base/kdegames/debian/ktuberling-trinity.install
index 098c979c8..098c979c8 100644
--- a/ubuntu/maverick/kdegames/debian/ktuberling-trinity.install
+++ b/ubuntu/_base/kdegames/debian/ktuberling-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/ktuberling-trinity.links b/ubuntu/_base/kdegames/debian/ktuberling-trinity.links
index 415a771ec..415a771ec 100644
--- a/ubuntu/maverick/kdegames/debian/ktuberling-trinity.links
+++ b/ubuntu/_base/kdegames/debian/ktuberling-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/ktuberling-trinity.manpages b/ubuntu/_base/kdegames/debian/ktuberling-trinity.manpages
index cde8002fa..cde8002fa 100644
--- a/ubuntu/maverick/kdegames/debian/ktuberling-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/ktuberling-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/ktuberling-trinity.menu b/ubuntu/_base/kdegames/debian/ktuberling-trinity.menu
index 5514bcfbc..5514bcfbc 100644
--- a/ubuntu/maverick/kdegames/debian/ktuberling-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/ktuberling-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/kwin4-trinity.install b/ubuntu/_base/kdegames/debian/kwin4-trinity.install
index eb5b27e1f..eb5b27e1f 100644
--- a/ubuntu/maverick/kdegames/debian/kwin4-trinity.install
+++ b/ubuntu/_base/kdegames/debian/kwin4-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/kwin4-trinity.links b/ubuntu/_base/kdegames/debian/kwin4-trinity.links
index 0619c70a6..0619c70a6 100644
--- a/ubuntu/maverick/kdegames/debian/kwin4-trinity.links
+++ b/ubuntu/_base/kdegames/debian/kwin4-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/kwin4-trinity.manpages b/ubuntu/_base/kdegames/debian/kwin4-trinity.manpages
index 610e1c8e9..610e1c8e9 100644
--- a/ubuntu/maverick/kdegames/debian/kwin4-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/kwin4-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/kwin4-trinity.menu b/ubuntu/_base/kdegames/debian/kwin4-trinity.menu
index 0dc4d281f..0dc4d281f 100644
--- a/ubuntu/maverick/kdegames/debian/kwin4-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/kwin4-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/libkdegames-trinity-dev.install b/ubuntu/_base/kdegames/debian/libkdegames-trinity-dev.install
index 921b88d08..921b88d08 100644
--- a/ubuntu/maverick/kdegames/debian/libkdegames-trinity-dev.install
+++ b/ubuntu/_base/kdegames/debian/libkdegames-trinity-dev.install
diff --git a/ubuntu/maverick/kdegames/debian/libkdegames-trinity-doc.doc-base b/ubuntu/_base/kdegames/debian/libkdegames-trinity-doc.doc-base
index 30492b65a..30492b65a 100644
--- a/ubuntu/maverick/kdegames/debian/libkdegames-trinity-doc.doc-base
+++ b/ubuntu/_base/kdegames/debian/libkdegames-trinity-doc.doc-base
diff --git a/ubuntu/maverick/kdegames/debian/libkdegames-trinity-doc.install b/ubuntu/_base/kdegames/debian/libkdegames-trinity-doc.install
index a223cd0c6..a223cd0c6 100644
--- a/ubuntu/maverick/kdegames/debian/libkdegames-trinity-doc.install
+++ b/ubuntu/_base/kdegames/debian/libkdegames-trinity-doc.install
diff --git a/ubuntu/maverick/kdegames/debian/libkdegames-trinity-doc.links b/ubuntu/_base/kdegames/debian/libkdegames-trinity-doc.links
index 4eee82d18..4eee82d18 100644
--- a/ubuntu/maverick/kdegames/debian/libkdegames-trinity-doc.links
+++ b/ubuntu/_base/kdegames/debian/libkdegames-trinity-doc.links
diff --git a/ubuntu/maverick/kdegames/debian/libkdegames1-trinity.install b/ubuntu/_base/kdegames/debian/libkdegames1-trinity.install
index 8fff1b082..8fff1b082 100644
--- a/ubuntu/maverick/kdegames/debian/libkdegames1-trinity.install
+++ b/ubuntu/_base/kdegames/debian/libkdegames1-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/lskat-trinity.install b/ubuntu/_base/kdegames/debian/lskat-trinity.install
index 7b301e9e0..7b301e9e0 100644
--- a/ubuntu/maverick/kdegames/debian/lskat-trinity.install
+++ b/ubuntu/_base/kdegames/debian/lskat-trinity.install
diff --git a/ubuntu/maverick/kdegames/debian/lskat-trinity.links b/ubuntu/_base/kdegames/debian/lskat-trinity.links
index 904bc2eab..904bc2eab 100644
--- a/ubuntu/maverick/kdegames/debian/lskat-trinity.links
+++ b/ubuntu/_base/kdegames/debian/lskat-trinity.links
diff --git a/ubuntu/maverick/kdegames/debian/lskat-trinity.manpages b/ubuntu/_base/kdegames/debian/lskat-trinity.manpages
index 728d1a013..728d1a013 100644
--- a/ubuntu/maverick/kdegames/debian/lskat-trinity.manpages
+++ b/ubuntu/_base/kdegames/debian/lskat-trinity.manpages
diff --git a/ubuntu/maverick/kdegames/debian/lskat-trinity.menu b/ubuntu/_base/kdegames/debian/lskat-trinity.menu
index d81800fa2..d81800fa2 100644
--- a/ubuntu/maverick/kdegames/debian/lskat-trinity.menu
+++ b/ubuntu/_base/kdegames/debian/lskat-trinity.menu
diff --git a/ubuntu/maverick/kdegames/debian/man/atlantik-trinity.man b/ubuntu/_base/kdegames/debian/man/atlantik-trinity.man
index 9d347120a..9d347120a 100644
--- a/ubuntu/maverick/kdegames/debian/man/atlantik-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/atlantik-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kasteroids-trinity.man b/ubuntu/_base/kdegames/debian/man/kasteroids-trinity.man
index 1c234f3fd..1c234f3fd 100644
--- a/ubuntu/maverick/kdegames/debian/man/kasteroids-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kasteroids-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/katomic-trinity.man b/ubuntu/_base/kdegames/debian/man/katomic-trinity.man
index e03df7727..e03df7727 100644
--- a/ubuntu/maverick/kdegames/debian/man/katomic-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/katomic-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kbackgammon-trinity.man b/ubuntu/_base/kdegames/debian/man/kbackgammon-trinity.man
index 2893478c9..2893478c9 100644
--- a/ubuntu/maverick/kdegames/debian/man/kbackgammon-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kbackgammon-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kbattleship-trinity.man b/ubuntu/_base/kdegames/debian/man/kbattleship-trinity.man
index 80b9e984c..80b9e984c 100644
--- a/ubuntu/maverick/kdegames/debian/man/kbattleship-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kbattleship-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kblackbox-trinity.man b/ubuntu/_base/kdegames/debian/man/kblackbox-trinity.man
index 296ad1aa9..296ad1aa9 100644
--- a/ubuntu/maverick/kdegames/debian/man/kblackbox-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kblackbox-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kbounce-trinity.man b/ubuntu/_base/kdegames/debian/man/kbounce-trinity.man
index 7559b6c46..7559b6c46 100644
--- a/ubuntu/maverick/kdegames/debian/man/kbounce-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kbounce-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kdeopt.part b/ubuntu/_base/kdegames/debian/man/kdeopt.part
index e32a1a94d..e32a1a94d 100644
--- a/ubuntu/maverick/kdegames/debian/man/kdeopt.part
+++ b/ubuntu/_base/kdegames/debian/man/kdeopt.part
diff --git a/ubuntu/maverick/kdegames/debian/man/kenolaba-trinity.man b/ubuntu/_base/kdegames/debian/man/kenolaba-trinity.man
index 51c59a75f..51c59a75f 100644
--- a/ubuntu/maverick/kdegames/debian/man/kenolaba-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kenolaba-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kfouleggs-trinity.man b/ubuntu/_base/kdegames/debian/man/kfouleggs-trinity.man
index 2f5a65e67..2f5a65e67 100644
--- a/ubuntu/maverick/kdegames/debian/man/kfouleggs-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kfouleggs-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kgoldrunner-trinity.man b/ubuntu/_base/kdegames/debian/man/kgoldrunner-trinity.man
index 34ace1a34..34ace1a34 100644
--- a/ubuntu/maverick/kdegames/debian/man/kgoldrunner-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kgoldrunner-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kjumpingcube-trinity.man b/ubuntu/_base/kdegames/debian/man/kjumpingcube-trinity.man
index 7d47914ad..7d47914ad 100644
--- a/ubuntu/maverick/kdegames/debian/man/kjumpingcube-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kjumpingcube-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/klickety-trinity.man b/ubuntu/_base/kdegames/debian/man/klickety-trinity.man
index ce9de5acb..ce9de5acb 100644
--- a/ubuntu/maverick/kdegames/debian/man/klickety-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/klickety-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/klines-trinity.man b/ubuntu/_base/kdegames/debian/man/klines-trinity.man
index 8c53e1d8e..8c53e1d8e 100644
--- a/ubuntu/maverick/kdegames/debian/man/klines-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/klines-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kmahjongg-trinity.man b/ubuntu/_base/kdegames/debian/man/kmahjongg-trinity.man
index 1a3aaf86c..1a3aaf86c 100644
--- a/ubuntu/maverick/kdegames/debian/man/kmahjongg-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kmahjongg-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kmines-trinity.man b/ubuntu/_base/kdegames/debian/man/kmines-trinity.man
index c18eb2e74..c18eb2e74 100644
--- a/ubuntu/maverick/kdegames/debian/man/kmines-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kmines-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/knetwalk-trinity.man b/ubuntu/_base/kdegames/debian/man/knetwalk-trinity.man
index 0b934aa04..0b934aa04 100644
--- a/ubuntu/maverick/kdegames/debian/man/knetwalk-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/knetwalk-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kolf-trinity.man b/ubuntu/_base/kdegames/debian/man/kolf-trinity.man
index 47fa71ef3..47fa71ef3 100644
--- a/ubuntu/maverick/kdegames/debian/man/kolf-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kolf-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/konquest-trinity.man b/ubuntu/_base/kdegames/debian/man/konquest-trinity.man
index 3fbef82d6..3fbef82d6 100644
--- a/ubuntu/maverick/kdegames/debian/man/konquest-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/konquest-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kpat-trinity.man b/ubuntu/_base/kdegames/debian/man/kpat-trinity.man
index a5f95956f..a5f95956f 100644
--- a/ubuntu/maverick/kdegames/debian/man/kpat-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kpat-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kpoker-trinity.man b/ubuntu/_base/kdegames/debian/man/kpoker-trinity.man
index a8c9cd5ca..a8c9cd5ca 100644
--- a/ubuntu/maverick/kdegames/debian/man/kpoker-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kpoker-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kreversi-trinity.man b/ubuntu/_base/kdegames/debian/man/kreversi-trinity.man
index efb22889b..efb22889b 100644
--- a/ubuntu/maverick/kdegames/debian/man/kreversi-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kreversi-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/ksame-trinity.man b/ubuntu/_base/kdegames/debian/man/ksame-trinity.man
index dbde2bad0..dbde2bad0 100644
--- a/ubuntu/maverick/kdegames/debian/man/ksame-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/ksame-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kshisen-trinity.man b/ubuntu/_base/kdegames/debian/man/kshisen-trinity.man
index 54600a2be..54600a2be 100644
--- a/ubuntu/maverick/kdegames/debian/man/kshisen-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kshisen-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/ksirtet-trinity.man b/ubuntu/_base/kdegames/debian/man/ksirtet-trinity.man
index d704c3685..d704c3685 100644
--- a/ubuntu/maverick/kdegames/debian/man/ksirtet-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/ksirtet-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/ksmiletris-trinity.man b/ubuntu/_base/kdegames/debian/man/ksmiletris-trinity.man
index 1711b49b3..1711b49b3 100644
--- a/ubuntu/maverick/kdegames/debian/man/ksmiletris-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/ksmiletris-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/ksnake-trinity.man b/ubuntu/_base/kdegames/debian/man/ksnake-trinity.man
index e789a6827..e789a6827 100644
--- a/ubuntu/maverick/kdegames/debian/man/ksnake-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/ksnake-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/ksokoban-trinity.man b/ubuntu/_base/kdegames/debian/man/ksokoban-trinity.man
index 1aab25ed9..1aab25ed9 100644
--- a/ubuntu/maverick/kdegames/debian/man/ksokoban-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/ksokoban-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kspaceduel-trinity.man b/ubuntu/_base/kdegames/debian/man/kspaceduel-trinity.man
index f743a72f0..f743a72f0 100644
--- a/ubuntu/maverick/kdegames/debian/man/kspaceduel-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kspaceduel-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/ktron-trinity.man b/ubuntu/_base/kdegames/debian/man/ktron-trinity.man
index ed5fa31ec..ed5fa31ec 100644
--- a/ubuntu/maverick/kdegames/debian/man/ktron-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/ktron-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/ktuberling-trinity.man b/ubuntu/_base/kdegames/debian/man/ktuberling-trinity.man
index 103470edb..103470edb 100644
--- a/ubuntu/maverick/kdegames/debian/man/ktuberling-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/ktuberling-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kwin4-trinity.man b/ubuntu/_base/kdegames/debian/man/kwin4-trinity.man
index f1e3a0def..f1e3a0def 100644
--- a/ubuntu/maverick/kdegames/debian/man/kwin4-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kwin4-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/kwin4proc-trinity.man b/ubuntu/_base/kdegames/debian/man/kwin4proc-trinity.man
index 3a8d08949..3a8d08949 100644
--- a/ubuntu/maverick/kdegames/debian/man/kwin4proc-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/kwin4proc-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/lskat-trinity.man b/ubuntu/_base/kdegames/debian/man/lskat-trinity.man
index 6ebaa3cda..6ebaa3cda 100644
--- a/ubuntu/maverick/kdegames/debian/man/lskat-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/lskat-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/man/lskatproc-trinity.man b/ubuntu/_base/kdegames/debian/man/lskatproc-trinity.man
index 091193208..091193208 100644
--- a/ubuntu/maverick/kdegames/debian/man/lskatproc-trinity.man
+++ b/ubuntu/_base/kdegames/debian/man/lskatproc-trinity.man
diff --git a/ubuntu/maverick/kdegames/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdegames/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdegames/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdegames/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdegames/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdegames/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdegames/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdegames/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdegames/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdegames/debian/patches/series b/ubuntu/_base/kdegames/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdegames/debian/patches/series
+++ b/ubuntu/_base/kdegames/debian/patches/series
diff --git a/ubuntu/maverick/kdegames/debian/rules b/ubuntu/_base/kdegames/debian/rules
index d63ea6d30..d63ea6d30 100755
--- a/ubuntu/maverick/kdegames/debian/rules
+++ b/ubuntu/_base/kdegames/debian/rules
diff --git a/ubuntu/maverick/kdegames/debian/source/format b/ubuntu/_base/kdegames/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdegames/debian/source/format
+++ b/ubuntu/_base/kdegames/debian/source/format
diff --git a/ubuntu/maverick/kdegames/debian/source/options b/ubuntu/_base/kdegames/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdegames/debian/source/options
+++ b/ubuntu/_base/kdegames/debian/source/options
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES
index b7d2adb39..b7d2adb39 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdegraphics.automake/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index 22a3fcf36..22a3fcf36 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk b/ubuntu/_base/kdegraphics.automake/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdegraphics.automake/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/versions.pl b/ubuntu/_base/kdegraphics.automake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdegraphics.automake/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/changelog b/ubuntu/_base/kdegraphics.automake/debian/changelog
index 38be59fe0..38be59fe0 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/changelog
+++ b/ubuntu/_base/kdegraphics.automake/debian/changelog
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/compat b/ubuntu/_base/kdegraphics.automake/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/compat
+++ b/ubuntu/_base/kdegraphics.automake/debian/compat
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/control b/ubuntu/_base/kdegraphics.automake/debian/control
index 382b89dbc..382b89dbc 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/control
+++ b/ubuntu/_base/kdegraphics.automake/debian/control
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/copyright b/ubuntu/_base/kdegraphics.automake/debian/copyright
index 13e809000..13e809000 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/copyright
+++ b/ubuntu/_base/kdegraphics.automake/debian/copyright
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm
index 22a32da35..22a32da35 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kcolorchooser-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kcolorchooser.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kcolorchooser.xpm
index 22d830b4b..22d830b4b 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kcolorchooser.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kcolorchooser.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kcoloredit-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kcoloredit-16.xpm
index 8e97bb914..8e97bb914 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kcoloredit-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kcoloredit-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kcoloredit.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kcoloredit.xpm
index 83b310ff0..83b310ff0 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kcoloredit.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kcoloredit.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kdvi-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kdvi-16.xpm
index db22767d4..db22767d4 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kdvi-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kdvi-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kdvi.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kdvi.xpm
index fe4db5b6c..fe4db5b6c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kdvi.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kdvi.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kfax-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kfax-16.xpm
index 48804f8a5..48804f8a5 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kfax-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kfax-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kfax.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kfax.xpm
index bd969b13a..bd969b13a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kfax.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kfax.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kfaxview-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kfaxview-16.xpm
index f5b699dcb..f5b699dcb 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kfaxview-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kfaxview-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kfaxview.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kfaxview.xpm
index aea8354f4..aea8354f4 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kfaxview.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kfaxview.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kghostview-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kghostview-16.xpm
index ccb9fa8ae..ccb9fa8ae 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kghostview-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kghostview-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kghostview.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kghostview.xpm
index 38bb64331..38bb64331 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kghostview.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kghostview.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kiconedit-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kiconedit-16.xpm
index 857f5fe1c..857f5fe1c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kiconedit-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kiconedit-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kiconedit.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kiconedit.xpm
index 412544858..412544858 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kiconedit.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kiconedit.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kolourpaint-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kolourpaint-16.xpm
index 79cabaf05..79cabaf05 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kolourpaint-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kolourpaint-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kolourpaint.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kolourpaint.xpm
index 32eba9310..32eba9310 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kolourpaint.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kolourpaint.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kooka-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kooka-16.xpm
index 46cd10535..46cd10535 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kooka-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kooka-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kooka.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kooka.xpm
index c720c7d21..c720c7d21 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kooka.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kooka.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kpdf-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kpdf-16.xpm
index ce5082f88..ce5082f88 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kpdf-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kpdf-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kpdf.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kpdf.xpm
index ae032c341..ae032c341 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kpdf.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kpdf.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm
index c25f014f0..c25f014f0 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kpovmodeler-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kpovmodeler.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kpovmodeler.xpm
index a998ccda9..a998ccda9 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kpovmodeler.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kpovmodeler.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kruler-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kruler-16.xpm
index 3e5a27d03..3e5a27d03 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kruler-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kruler-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kruler.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kruler.xpm
index 030fad1f5..030fad1f5 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kruler.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kruler.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/ksnapshot-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/ksnapshot-16.xpm
index f97cb30aa..f97cb30aa 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/ksnapshot-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/ksnapshot-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/ksnapshot.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/ksnapshot.xpm
index 302c59d25..302c59d25 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/ksnapshot.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/ksnapshot.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kuickshow-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kuickshow-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kuickshow-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kuickshow.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kuickshow.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kuickshow.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kview-16.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kview-16.xpm
index 886c4821b..886c4821b 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kview-16.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kview-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/icons/kview.xpm b/ubuntu/_base/kdegraphics.automake/debian/icons/kview.xpm
index 606fc37e6..606fc37e6 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/icons/kview.xpm
+++ b/ubuntu/_base/kdegraphics.automake/debian/icons/kview.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kamera-trinity.install
index d1955c8f0..d1955c8f0 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kamera-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kamera-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kcoloredit-trinity.install
index d885d8ed8..d885d8ed8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kcoloredit-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kcoloredit-trinity.manpages
index e4673b667..e4673b667 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kcoloredit-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kcoloredit-trinity.menu
index a864f4fcb..a864f4fcb 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kcoloredit-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
index 3c15273ee..3c15273ee 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-dev-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
index 7909a26ea..7909a26ea 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kamera
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
index 0d401a846..0d401a846 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kcoloredit
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
index 9f0bf4ab8..9f0bf4ab8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kdvi
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
index 2ce9d716f..2ce9d716f 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kgamma
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
index e18d32a2a..e18d32a2a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kghostview
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
index 6e974fd53..6e974fd53 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kiconedit
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
index 7913d8654..7913d8654 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kolourpaint
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
index d009db00c..d009db00c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kooka
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
index 2060502d2..2060502d2 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpdf
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
index ea24b515e..ea24b515e 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kpovmodeler
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
index d86f6da8e..d86f6da8e 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kruler
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
index 97006ef6e..97006ef6e 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.ksnapshot
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
index fdb5baa20..fdb5baa20 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kuickshow
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
index 8824a84f5..8824a84f5 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-doc-html.doc-base.kview
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
index d7a77267e..d7a77267e 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdegraphics-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kdvi-trinity.install
index b0170ca7c..b0170ca7c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdvi-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kdvi-trinity.manpages
index 6cab6e597..6cab6e597 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdvi-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kdvi-trinity.menu
index fd6a7d3be..fd6a7d3be 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdvi-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.mime b/ubuntu/_base/kdegraphics.automake/debian/kdvi-trinity.mime
index 61bd2bb9b..61bd2bb9b 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.mime
+++ b/ubuntu/_base/kdegraphics.automake/debian/kdvi-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kfax-trinity.install
index 5c08ae3e5..5c08ae3e5 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kfax-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kfax-trinity.manpages
index 57b6c7961..57b6c7961 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kfax-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kfax-trinity.menu
index 3498fed01..3498fed01 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kfax-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.mime b/ubuntu/_base/kdegraphics.automake/debian/kfax-trinity.mime
index e4aede21c..e4aede21c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.mime
+++ b/ubuntu/_base/kdegraphics.automake/debian/kfax-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kfaxview-trinity.install
index 92000e53a..92000e53a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kfaxview-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.lintian b/ubuntu/_base/kdegraphics.automake/debian/kfaxview-trinity.lintian
index 7d86c17d3..7d86c17d3 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.lintian
+++ b/ubuntu/_base/kdegraphics.automake/debian/kfaxview-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kfaxview-trinity.manpages
index a30d1c56a..a30d1c56a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kfaxview-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kfaxview-trinity.menu
index 64550dfb4..64550dfb4 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kfaxview-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kgamma-trinity.install
index 4b4875ac9..4b4875ac9 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kgamma-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.install
index b967faccf..b967faccf 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.lintian b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.lintian
index 5bf0bd75c..5bf0bd75c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.lintian
+++ b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.manpages
index 8cfcbdec7..8cfcbdec7 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.menu
index 70467d3f7..70467d3f7 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.mime b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.mime
index b8894e89c..b8894e89c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.mime
+++ b/ubuntu/_base/kdegraphics.automake/debian/kghostview-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kiconedit-trinity.install
index 66bf9a180..66bf9a180 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kiconedit-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kiconedit-trinity.manpages
index 2f136ed6c..2f136ed6c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kiconedit-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kiconedit-trinity.menu
index 7add5c4f6..7add5c4f6 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kiconedit-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kmrml-trinity.install
index 99491c4e7..99491c4e7 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kmrml-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.lintian b/ubuntu/_base/kdegraphics.automake/debian/kmrml-trinity.lintian
index 5c83f447b..5c83f447b 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kmrml-trinity.lintian
+++ b/ubuntu/_base/kdegraphics.automake/debian/kmrml-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kolourpaint-trinity.install
index 3ee0f1de8..3ee0f1de8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kolourpaint-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kolourpaint-trinity.manpages
index a10ddf05a..a10ddf05a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kolourpaint-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kolourpaint-trinity.menu
index 4ae819ad3..4ae819ad3 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kolourpaint-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kooka-trinity.install
index 958395531..958395531 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kooka-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kooka-trinity.manpages
index 319f8652c..319f8652c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kooka-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kooka-trinity.menu
index a1c221081..a1c221081 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kooka-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kpdf-trinity.install
index 85cde09a4..85cde09a4 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kpdf-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kpdf-trinity.manpages
index 36f3caafb..36f3caafb 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kpdf-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kpdf-trinity.menu
index a9bf7aa0a..a9bf7aa0a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kpdf-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.mime b/ubuntu/_base/kdegraphics.automake/debian/kpdf-trinity.mime
index 7592a8adb..7592a8adb 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.mime
+++ b/ubuntu/_base/kdegraphics.automake/debian/kpdf-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kpovmodeler-trinity.install
index d0e50b60a..d0e50b60a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kpovmodeler-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.lintian b/ubuntu/_base/kdegraphics.automake/debian/kpovmodeler-trinity.lintian
index 18443a699..18443a699 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.lintian
+++ b/ubuntu/_base/kdegraphics.automake/debian/kpovmodeler-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kpovmodeler-trinity.manpages
index 11c1a16f8..11c1a16f8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kpovmodeler-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kpovmodeler-trinity.menu
index 2ac1d39a7..2ac1d39a7 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kpovmodeler-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kruler-trinity.install
index 9256c231a..9256c231a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kruler-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kruler-trinity.manpages
index aac20ba29..aac20ba29 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kruler-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kruler-trinity.menu
index b84cda933..b84cda933 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kruler-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/ksnapshot-trinity.install
index 4b83732a3..4b83732a3 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/ksnapshot-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/ksnapshot-trinity.manpages
index efb781eba..efb781eba 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/ksnapshot-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/ksnapshot-trinity.menu
index 5939d5d61..5939d5d61 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/ksnapshot-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/ksvg-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/ksvg-trinity.install
index e7264cbb8..e7264cbb8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/ksvg-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/ksvg-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/ksvg-trinity.lintian b/ubuntu/_base/kdegraphics.automake/debian/ksvg-trinity.lintian
index 9f56c22ee..9f56c22ee 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/ksvg-trinity.lintian
+++ b/ubuntu/_base/kdegraphics.automake/debian/ksvg-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kuickshow-trinity.install
index e7441cdad..e7441cdad 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kuickshow-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.lintian b/ubuntu/_base/kdegraphics.automake/debian/kuickshow-trinity.lintian
index 61cb450ac..61cb450ac 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.lintian
+++ b/ubuntu/_base/kdegraphics.automake/debian/kuickshow-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kuickshow-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kuickshow-trinity.menu
index 4075305dc..4075305dc 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kuickshow-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.install
index 4b008ca4d..4b008ca4d 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.lintian b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.lintian
index 8314a8155..8314a8155 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.lintian
+++ b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.manpages
index bad8bf322..bad8bf322 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.menu b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.menu
index e0779319d..e0779319d 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.menu
+++ b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.mime b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.mime
index 16e079720..16e079720 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.mime
+++ b/ubuntu/_base/kdegraphics.automake/debian/kview-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/kviewshell-trinity.install
index 2d4ea669a..2d4ea669a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/kviewshell-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian b/ubuntu/_base/kdegraphics.automake/debian/kviewshell-trinity.lintian
index 4a0571207..4a0571207 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.lintian
+++ b/ubuntu/_base/kdegraphics.automake/debian/kviewshell-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.manpages b/ubuntu/_base/kdegraphics.automake/debian/kviewshell-trinity.manpages
index 89af3c5f2..89af3c5f2 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kviewshell-trinity.manpages
+++ b/ubuntu/_base/kdegraphics.automake/debian/kviewshell-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/libkscan-dev-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/libkscan-dev-trinity.install
index 29764eb5d..29764eb5d 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/libkscan-dev-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/libkscan-dev-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/libkscan1-trinity.install b/ubuntu/_base/kdegraphics.automake/debian/libkscan1-trinity.install
index 00674e14c..00674e14c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/libkscan1-trinity.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/libkscan1-trinity.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install b/ubuntu/_base/kdegraphics.automake/debian/libpoppler-tqt-dev.install
index 57d9ec1d0..57d9ec1d0 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/libpoppler-tqt-dev.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt.install b/ubuntu/_base/kdegraphics.automake/debian/libpoppler-tqt.install
index d63075962..d63075962 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt.install
+++ b/ubuntu/_base/kdegraphics.automake/debian/libpoppler-tqt.install
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kcolorchooser.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kcolorchooser.1
index e856c927c..e856c927c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kcolorchooser.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kcolorchooser.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kcoloredit.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kcoloredit.1
index 95807e3cd..95807e3cd 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kcoloredit.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kcoloredit.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kdvi.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kdvi.1
index 39bcbff11..39bcbff11 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kdvi.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kdvi.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kfax.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kfax.1
index 9d97915ff..9d97915ff 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kfax.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kfax.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kfaxview.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kfaxview.1
index 48dc9f74d..48dc9f74d 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kfaxview.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kfaxview.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kghostview.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kghostview.1
index a29a2c025..a29a2c025 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kghostview.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kghostview.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kiconedit.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kiconedit.1
index a91a5c1de..a91a5c1de 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kiconedit.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kiconedit.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kolourpaint.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kolourpaint.1
index 3a736b48c..3a736b48c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kolourpaint.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kolourpaint.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kooka.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kooka.1
index fc14a0984..fc14a0984 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kooka.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kooka.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kpdf.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kpdf.1
index 2b1ffaeeb..2b1ffaeeb 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kpdf.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kpdf.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kpovmodeler.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kpovmodeler.1
index ca14d57b8..ca14d57b8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kpovmodeler.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kpovmodeler.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kruler.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kruler.1
index 617aef584..617aef584 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kruler.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kruler.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/ksnapshot.1 b/ubuntu/_base/kdegraphics.automake/debian/man/ksnapshot.1
index abe516b09..abe516b09 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/ksnapshot.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/ksnapshot.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kuickshow.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kuickshow.1
index 2675eae4e..2675eae4e 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kuickshow.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kuickshow.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kview.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kview.1
index a506b7e20..a506b7e20 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kview.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kview.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/man/kviewshell.1 b/ubuntu/_base/kdegraphics.automake/debian/man/kviewshell.1
index e9c762af2..e9c762af2 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/man/kviewshell.1
+++ b/ubuntu/_base/kdegraphics.automake/debian/man/kviewshell.1
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdegraphics.automake/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdegraphics.automake/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/series b/ubuntu/_base/kdegraphics.automake/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/patches/series
+++ b/ubuntu/_base/kdegraphics.automake/debian/patches/series
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/rules b/ubuntu/_base/kdegraphics.automake/debian/rules
index 0f73112ef..0f73112ef 100755
--- a/ubuntu/maverick/kdegraphics.automake/debian/rules
+++ b/ubuntu/_base/kdegraphics.automake/debian/rules
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/source/format b/ubuntu/_base/kdegraphics.automake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/source/format
+++ b/ubuntu/_base/kdegraphics.automake/debian/source/format
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/source/options b/ubuntu/_base/kdegraphics.automake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/source/options
+++ b/ubuntu/_base/kdegraphics.automake/debian/source/options
diff --git a/ubuntu/maverick/kdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
index b7d2adb39..b7d2adb39 100644
--- a/ubuntu/maverick/kdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdegraphics/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdegraphics/debian/cdbs/debian-qt-kde.mk
index 22a3fcf36..22a3fcf36 100644
--- a/ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdegraphics/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdegraphics/debian/cdbs/kde.mk b/ubuntu/_base/kdegraphics/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdegraphics/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdegraphics/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdegraphics/debian/cdbs/versions.pl b/ubuntu/_base/kdegraphics/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdegraphics/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdegraphics/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdegraphics/debian/changelog b/ubuntu/_base/kdegraphics/debian/changelog
index 38be59fe0..38be59fe0 100644
--- a/ubuntu/maverick/kdegraphics/debian/changelog
+++ b/ubuntu/_base/kdegraphics/debian/changelog
diff --git a/ubuntu/maverick/kdegraphics/debian/compat b/ubuntu/_base/kdegraphics/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdegraphics/debian/compat
+++ b/ubuntu/_base/kdegraphics/debian/compat
diff --git a/ubuntu/maverick/kdegraphics/debian/control b/ubuntu/_base/kdegraphics/debian/control
index f29523e23..f29523e23 100644
--- a/ubuntu/maverick/kdegraphics/debian/control
+++ b/ubuntu/_base/kdegraphics/debian/control
diff --git a/ubuntu/maverick/kdegraphics/debian/copyright b/ubuntu/_base/kdegraphics/debian/copyright
index 13e809000..13e809000 100644
--- a/ubuntu/maverick/kdegraphics/debian/copyright
+++ b/ubuntu/_base/kdegraphics/debian/copyright
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kcolorchooser-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kcolorchooser-16.xpm
index 22a32da35..22a32da35 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kcolorchooser-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kcolorchooser-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kcolorchooser.xpm b/ubuntu/_base/kdegraphics/debian/icons/kcolorchooser.xpm
index 22d830b4b..22d830b4b 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kcolorchooser.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kcolorchooser.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kcoloredit-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kcoloredit-16.xpm
index 8e97bb914..8e97bb914 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kcoloredit-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kcoloredit-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kcoloredit.xpm b/ubuntu/_base/kdegraphics/debian/icons/kcoloredit.xpm
index 83b310ff0..83b310ff0 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kcoloredit.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kcoloredit.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kdvi-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kdvi-16.xpm
index db22767d4..db22767d4 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kdvi-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kdvi-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kdvi.xpm b/ubuntu/_base/kdegraphics/debian/icons/kdvi.xpm
index fe4db5b6c..fe4db5b6c 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kdvi.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kdvi.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kfax-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kfax-16.xpm
index 48804f8a5..48804f8a5 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kfax-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kfax-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kfax.xpm b/ubuntu/_base/kdegraphics/debian/icons/kfax.xpm
index bd969b13a..bd969b13a 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kfax.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kfax.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kfaxview-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kfaxview-16.xpm
index f5b699dcb..f5b699dcb 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kfaxview-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kfaxview-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kfaxview.xpm b/ubuntu/_base/kdegraphics/debian/icons/kfaxview.xpm
index aea8354f4..aea8354f4 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kfaxview.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kfaxview.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kghostview-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kghostview-16.xpm
index ccb9fa8ae..ccb9fa8ae 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kghostview-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kghostview-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kghostview.xpm b/ubuntu/_base/kdegraphics/debian/icons/kghostview.xpm
index 38bb64331..38bb64331 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kghostview.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kghostview.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kiconedit-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kiconedit-16.xpm
index 857f5fe1c..857f5fe1c 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kiconedit-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kiconedit-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kiconedit.xpm b/ubuntu/_base/kdegraphics/debian/icons/kiconedit.xpm
index 412544858..412544858 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kiconedit.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kiconedit.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kolourpaint-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kolourpaint-16.xpm
index 79cabaf05..79cabaf05 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kolourpaint-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kolourpaint-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kolourpaint.xpm b/ubuntu/_base/kdegraphics/debian/icons/kolourpaint.xpm
index 32eba9310..32eba9310 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kolourpaint.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kolourpaint.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kooka-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kooka-16.xpm
index 46cd10535..46cd10535 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kooka-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kooka-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kooka.xpm b/ubuntu/_base/kdegraphics/debian/icons/kooka.xpm
index c720c7d21..c720c7d21 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kooka.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kooka.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kpdf-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kpdf-16.xpm
index ce5082f88..ce5082f88 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kpdf-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kpdf-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kpdf.xpm b/ubuntu/_base/kdegraphics/debian/icons/kpdf.xpm
index ae032c341..ae032c341 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kpdf.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kpdf.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kpovmodeler-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kpovmodeler-16.xpm
index c25f014f0..c25f014f0 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kpovmodeler-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kpovmodeler-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kpovmodeler.xpm b/ubuntu/_base/kdegraphics/debian/icons/kpovmodeler.xpm
index a998ccda9..a998ccda9 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kpovmodeler.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kpovmodeler.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kruler-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kruler-16.xpm
index 3e5a27d03..3e5a27d03 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kruler-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kruler-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kruler.xpm b/ubuntu/_base/kdegraphics/debian/icons/kruler.xpm
index 030fad1f5..030fad1f5 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kruler.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kruler.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/ksnapshot-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/ksnapshot-16.xpm
index f97cb30aa..f97cb30aa 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/ksnapshot-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/ksnapshot-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/ksnapshot.xpm b/ubuntu/_base/kdegraphics/debian/icons/ksnapshot.xpm
index 302c59d25..302c59d25 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/ksnapshot.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/ksnapshot.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kuickshow-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kuickshow-16.xpm
index cf91f34d9..cf91f34d9 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kuickshow-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kuickshow-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kuickshow.xpm b/ubuntu/_base/kdegraphics/debian/icons/kuickshow.xpm
index 5d2d6ca97..5d2d6ca97 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kuickshow.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kuickshow.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kview-16.xpm b/ubuntu/_base/kdegraphics/debian/icons/kview-16.xpm
index 886c4821b..886c4821b 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kview-16.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kview-16.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/icons/kview.xpm b/ubuntu/_base/kdegraphics/debian/icons/kview.xpm
index 606fc37e6..606fc37e6 100644
--- a/ubuntu/maverick/kdegraphics/debian/icons/kview.xpm
+++ b/ubuntu/_base/kdegraphics/debian/icons/kview.xpm
diff --git a/ubuntu/maverick/kdegraphics/debian/kamera-trinity.install b/ubuntu/_base/kdegraphics/debian/kamera-trinity.install
index d1955c8f0..d1955c8f0 100644
--- a/ubuntu/maverick/kdegraphics/debian/kamera-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kamera-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kcoloredit-trinity.install b/ubuntu/_base/kdegraphics/debian/kcoloredit-trinity.install
index c63cb6a5e..c63cb6a5e 100644
--- a/ubuntu/maverick/kdegraphics/debian/kcoloredit-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kcoloredit-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kcoloredit-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kcoloredit-trinity.manpages
index e4673b667..e4673b667 100644
--- a/ubuntu/maverick/kdegraphics/debian/kcoloredit-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kcoloredit-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kcoloredit-trinity.menu b/ubuntu/_base/kdegraphics/debian/kcoloredit-trinity.menu
index 16c26bf33..16c26bf33 100644
--- a/ubuntu/maverick/kdegraphics/debian/kcoloredit-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kcoloredit-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera
index 7909a26ea..7909a26ea 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kamera
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit
index 0d401a846..0d401a846 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kcoloredit
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi
index 9f0bf4ab8..9f0bf4ab8 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kdvi
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma
index 2ce9d716f..2ce9d716f 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kgamma
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview
index e18d32a2a..e18d32a2a 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kghostview
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit
index 6e974fd53..6e974fd53 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kiconedit
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint
index 7913d8654..7913d8654 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kolourpaint
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka
index d009db00c..d009db00c 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kooka
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf
index 2060502d2..2060502d2 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpdf
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler
index ea24b515e..ea24b515e 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kpovmodeler
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler
index d86f6da8e..d86f6da8e 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kruler
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot
index 97006ef6e..97006ef6e 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.ksnapshot
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow
index fdb5baa20..fdb5baa20 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kuickshow
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview
index 8824a84f5..8824a84f5 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-doc-html.doc-base.kview
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install b/ubuntu/_base/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
index d7a77267e..d7a77267e 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kdegraphics-trinity-dev.install b/ubuntu/_base/kdegraphics/debian/kdegraphics-trinity-dev.install
index b22c37376..b22c37376 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdegraphics-trinity-dev.install
+++ b/ubuntu/_base/kdegraphics/debian/kdegraphics-trinity-dev.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kdvi-trinity.install b/ubuntu/_base/kdegraphics/debian/kdvi-trinity.install
index 1bdfcbd5e..1bdfcbd5e 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdvi-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kdvi-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kdvi-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kdvi-trinity.manpages
index 6cab6e597..6cab6e597 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdvi-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kdvi-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kdvi-trinity.menu b/ubuntu/_base/kdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..ff4a21a01 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdvi-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kdvi-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kdvi-trinity.mime b/ubuntu/_base/kdegraphics/debian/kdvi-trinity.mime
index 61bd2bb9b..61bd2bb9b 100644
--- a/ubuntu/maverick/kdegraphics/debian/kdvi-trinity.mime
+++ b/ubuntu/_base/kdegraphics/debian/kdvi-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics/debian/kfax-trinity.install b/ubuntu/_base/kdegraphics/debian/kfax-trinity.install
index 8ab8860d2..8ab8860d2 100644
--- a/ubuntu/maverick/kdegraphics/debian/kfax-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kfax-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kfax-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kfax-trinity.manpages
index 57b6c7961..57b6c7961 100644
--- a/ubuntu/maverick/kdegraphics/debian/kfax-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kfax-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kfax-trinity.menu b/ubuntu/_base/kdegraphics/debian/kfax-trinity.menu
index e589bf6f6..e589bf6f6 100644
--- a/ubuntu/maverick/kdegraphics/debian/kfax-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kfax-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kfax-trinity.mime b/ubuntu/_base/kdegraphics/debian/kfax-trinity.mime
index e4aede21c..e4aede21c 100644
--- a/ubuntu/maverick/kdegraphics/debian/kfax-trinity.mime
+++ b/ubuntu/_base/kdegraphics/debian/kfax-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.install b/ubuntu/_base/kdegraphics/debian/kfaxview-trinity.install
index b82c77aa2..b82c77aa2 100644
--- a/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kfaxview-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.lintian b/ubuntu/_base/kdegraphics/debian/kfaxview-trinity.lintian
index 77a1b0e8e..77a1b0e8e 100644
--- a/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.lintian
+++ b/ubuntu/_base/kdegraphics/debian/kfaxview-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kfaxview-trinity.manpages
index a30d1c56a..a30d1c56a 100644
--- a/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kfaxview-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.menu b/ubuntu/_base/kdegraphics/debian/kfaxview-trinity.menu
index ec47674cf..ec47674cf 100644
--- a/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kfaxview-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kgamma-trinity.install b/ubuntu/_base/kdegraphics/debian/kgamma-trinity.install
index 4b4875ac9..4b4875ac9 100644
--- a/ubuntu/maverick/kdegraphics/debian/kgamma-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kgamma-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.install b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.install
index a464df646..a464df646 100644
--- a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.lintian b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.lintian
index 00a976862..00a976862 100644
--- a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.lintian
+++ b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.manpages
index 8cfcbdec7..8cfcbdec7 100644
--- a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.menu b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..b6398cbaf 100644
--- a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.mime b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.mime
index b8894e89c..b8894e89c 100644
--- a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.mime
+++ b/ubuntu/_base/kdegraphics/debian/kghostview-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics/debian/kiconedit-trinity.install b/ubuntu/_base/kdegraphics/debian/kiconedit-trinity.install
index d4cf6ee97..d4cf6ee97 100644
--- a/ubuntu/maverick/kdegraphics/debian/kiconedit-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kiconedit-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kiconedit-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kiconedit-trinity.manpages
index 2f136ed6c..2f136ed6c 100644
--- a/ubuntu/maverick/kdegraphics/debian/kiconedit-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kiconedit-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kiconedit-trinity.menu b/ubuntu/_base/kdegraphics/debian/kiconedit-trinity.menu
index 5c72f070f..5c72f070f 100644
--- a/ubuntu/maverick/kdegraphics/debian/kiconedit-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kiconedit-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kmrml-trinity.install b/ubuntu/_base/kdegraphics/debian/kmrml-trinity.install
index 99491c4e7..99491c4e7 100644
--- a/ubuntu/maverick/kdegraphics/debian/kmrml-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kmrml-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kmrml-trinity.lintian b/ubuntu/_base/kdegraphics/debian/kmrml-trinity.lintian
index 1e1c0f081..1e1c0f081 100644
--- a/ubuntu/maverick/kdegraphics/debian/kmrml-trinity.lintian
+++ b/ubuntu/_base/kdegraphics/debian/kmrml-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics/debian/kolourpaint-trinity.install b/ubuntu/_base/kdegraphics/debian/kolourpaint-trinity.install
index 0f256e00b..0f256e00b 100644
--- a/ubuntu/maverick/kdegraphics/debian/kolourpaint-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kolourpaint-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kolourpaint-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kolourpaint-trinity.manpages
index a10ddf05a..a10ddf05a 100644
--- a/ubuntu/maverick/kdegraphics/debian/kolourpaint-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kolourpaint-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kolourpaint-trinity.menu b/ubuntu/_base/kdegraphics/debian/kolourpaint-trinity.menu
index 8af5a0655..8af5a0655 100644
--- a/ubuntu/maverick/kdegraphics/debian/kolourpaint-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kolourpaint-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kooka-trinity.install b/ubuntu/_base/kdegraphics/debian/kooka-trinity.install
index d786c4b16..d786c4b16 100644
--- a/ubuntu/maverick/kdegraphics/debian/kooka-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kooka-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kooka-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kooka-trinity.manpages
index 319f8652c..319f8652c 100644
--- a/ubuntu/maverick/kdegraphics/debian/kooka-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kooka-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kooka-trinity.menu b/ubuntu/_base/kdegraphics/debian/kooka-trinity.menu
index 5463d0e5b..5463d0e5b 100644
--- a/ubuntu/maverick/kdegraphics/debian/kooka-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kooka-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kpdf-trinity.install b/ubuntu/_base/kdegraphics/debian/kpdf-trinity.install
index 0352f76ef..0352f76ef 100644
--- a/ubuntu/maverick/kdegraphics/debian/kpdf-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kpdf-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kpdf-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kpdf-trinity.manpages
index 36f3caafb..36f3caafb 100644
--- a/ubuntu/maverick/kdegraphics/debian/kpdf-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kpdf-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kpdf-trinity.menu b/ubuntu/_base/kdegraphics/debian/kpdf-trinity.menu
index 2fb16ea91..2fb16ea91 100644
--- a/ubuntu/maverick/kdegraphics/debian/kpdf-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kpdf-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kpdf-trinity.mime b/ubuntu/_base/kdegraphics/debian/kpdf-trinity.mime
index 7592a8adb..7592a8adb 100644
--- a/ubuntu/maverick/kdegraphics/debian/kpdf-trinity.mime
+++ b/ubuntu/_base/kdegraphics/debian/kpdf-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.install b/ubuntu/_base/kdegraphics/debian/kpovmodeler-trinity.install
index 308070549..308070549 100644
--- a/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kpovmodeler-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.lintian b/ubuntu/_base/kdegraphics/debian/kpovmodeler-trinity.lintian
index 354b0da93..354b0da93 100644
--- a/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/ubuntu/_base/kdegraphics/debian/kpovmodeler-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kpovmodeler-trinity.manpages
index 11c1a16f8..11c1a16f8 100644
--- a/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kpovmodeler-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.menu b/ubuntu/_base/kdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..5e1179c29 100644
--- a/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kpovmodeler-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kruler-trinity.install b/ubuntu/_base/kdegraphics/debian/kruler-trinity.install
index d2e6878c0..d2e6878c0 100644
--- a/ubuntu/maverick/kdegraphics/debian/kruler-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kruler-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kruler-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kruler-trinity.manpages
index aac20ba29..aac20ba29 100644
--- a/ubuntu/maverick/kdegraphics/debian/kruler-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kruler-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kruler-trinity.menu b/ubuntu/_base/kdegraphics/debian/kruler-trinity.menu
index 9daca2d6e..9daca2d6e 100644
--- a/ubuntu/maverick/kdegraphics/debian/kruler-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kruler-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/ksnapshot-trinity.install b/ubuntu/_base/kdegraphics/debian/ksnapshot-trinity.install
index a159b7436..a159b7436 100644
--- a/ubuntu/maverick/kdegraphics/debian/ksnapshot-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/ksnapshot-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/ksnapshot-trinity.manpages b/ubuntu/_base/kdegraphics/debian/ksnapshot-trinity.manpages
index efb781eba..efb781eba 100644
--- a/ubuntu/maverick/kdegraphics/debian/ksnapshot-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/ksnapshot-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/ksnapshot-trinity.menu b/ubuntu/_base/kdegraphics/debian/ksnapshot-trinity.menu
index e8edab9e2..e8edab9e2 100644
--- a/ubuntu/maverick/kdegraphics/debian/ksnapshot-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/ksnapshot-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/ksvg-trinity.install b/ubuntu/_base/kdegraphics/debian/ksvg-trinity.install
index e7264cbb8..e7264cbb8 100644
--- a/ubuntu/maverick/kdegraphics/debian/ksvg-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/ksvg-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/ksvg-trinity.lintian b/ubuntu/_base/kdegraphics/debian/ksvg-trinity.lintian
index 64f139273..64f139273 100644
--- a/ubuntu/maverick/kdegraphics/debian/ksvg-trinity.lintian
+++ b/ubuntu/_base/kdegraphics/debian/ksvg-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.install b/ubuntu/_base/kdegraphics/debian/kuickshow-trinity.install
index d7909731b..d7909731b 100644
--- a/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kuickshow-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/_base/kdegraphics/debian/kuickshow-trinity.lintian
index dd274dba5..dd274dba5 100644
--- a/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/_base/kdegraphics/debian/kuickshow-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kuickshow-trinity.manpages
index 3eadda903..3eadda903 100644
--- a/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kuickshow-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.menu b/ubuntu/_base/kdegraphics/debian/kuickshow-trinity.menu
index 7667ba6ee..7667ba6ee 100644
--- a/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kuickshow-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kview-trinity.install b/ubuntu/_base/kdegraphics/debian/kview-trinity.install
index 0fcf823ab..0fcf823ab 100644
--- a/ubuntu/maverick/kdegraphics/debian/kview-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kview-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kview-trinity.lintian b/ubuntu/_base/kdegraphics/debian/kview-trinity.lintian
index 7459b4b82..7459b4b82 100644
--- a/ubuntu/maverick/kdegraphics/debian/kview-trinity.lintian
+++ b/ubuntu/_base/kdegraphics/debian/kview-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics/debian/kview-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kview-trinity.manpages
index bad8bf322..bad8bf322 100644
--- a/ubuntu/maverick/kdegraphics/debian/kview-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kview-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/kview-trinity.menu b/ubuntu/_base/kdegraphics/debian/kview-trinity.menu
index b835f26fc..b835f26fc 100644
--- a/ubuntu/maverick/kdegraphics/debian/kview-trinity.menu
+++ b/ubuntu/_base/kdegraphics/debian/kview-trinity.menu
diff --git a/ubuntu/maverick/kdegraphics/debian/kview-trinity.mime b/ubuntu/_base/kdegraphics/debian/kview-trinity.mime
index 16e079720..16e079720 100644
--- a/ubuntu/maverick/kdegraphics/debian/kview-trinity.mime
+++ b/ubuntu/_base/kdegraphics/debian/kview-trinity.mime
diff --git a/ubuntu/maverick/kdegraphics/debian/kviewshell-trinity.install b/ubuntu/_base/kdegraphics/debian/kviewshell-trinity.install
index 2d4ea669a..2d4ea669a 100644
--- a/ubuntu/maverick/kdegraphics/debian/kviewshell-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/kviewshell-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/kviewshell-trinity.lintian b/ubuntu/_base/kdegraphics/debian/kviewshell-trinity.lintian
index 5e80c0a55..5e80c0a55 100644
--- a/ubuntu/maverick/kdegraphics/debian/kviewshell-trinity.lintian
+++ b/ubuntu/_base/kdegraphics/debian/kviewshell-trinity.lintian
diff --git a/ubuntu/maverick/kdegraphics/debian/kviewshell-trinity.manpages b/ubuntu/_base/kdegraphics/debian/kviewshell-trinity.manpages
index 89af3c5f2..89af3c5f2 100644
--- a/ubuntu/maverick/kdegraphics/debian/kviewshell-trinity.manpages
+++ b/ubuntu/_base/kdegraphics/debian/kviewshell-trinity.manpages
diff --git a/ubuntu/maverick/kdegraphics/debian/libkscan-dev-trinity.install b/ubuntu/_base/kdegraphics/debian/libkscan-dev-trinity.install
index 29764eb5d..29764eb5d 100644
--- a/ubuntu/maverick/kdegraphics/debian/libkscan-dev-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/libkscan-dev-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/libkscan1-trinity.install b/ubuntu/_base/kdegraphics/debian/libkscan1-trinity.install
index 00674e14c..00674e14c 100644
--- a/ubuntu/maverick/kdegraphics/debian/libkscan1-trinity.install
+++ b/ubuntu/_base/kdegraphics/debian/libkscan1-trinity.install
diff --git a/ubuntu/maverick/kdegraphics/debian/libpoppler-tqt-dev.install b/ubuntu/_base/kdegraphics/debian/libpoppler-tqt-dev.install
index f737043af..f737043af 100644
--- a/ubuntu/maverick/kdegraphics/debian/libpoppler-tqt-dev.install
+++ b/ubuntu/_base/kdegraphics/debian/libpoppler-tqt-dev.install
diff --git a/ubuntu/maverick/kdegraphics/debian/libpoppler-tqt.install b/ubuntu/_base/kdegraphics/debian/libpoppler-tqt.install
index d63075962..d63075962 100644
--- a/ubuntu/maverick/kdegraphics/debian/libpoppler-tqt.install
+++ b/ubuntu/_base/kdegraphics/debian/libpoppler-tqt.install
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kcolorchooser.1 b/ubuntu/_base/kdegraphics/debian/man/kcolorchooser.1
index e856c927c..e856c927c 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kcolorchooser.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kcolorchooser.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kcoloredit.1 b/ubuntu/_base/kdegraphics/debian/man/kcoloredit.1
index 95807e3cd..95807e3cd 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kcoloredit.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kcoloredit.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kdvi.1 b/ubuntu/_base/kdegraphics/debian/man/kdvi.1
index 39bcbff11..39bcbff11 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kdvi.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kdvi.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kfax.1 b/ubuntu/_base/kdegraphics/debian/man/kfax.1
index 9d97915ff..9d97915ff 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kfax.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kfax.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kfaxview.1 b/ubuntu/_base/kdegraphics/debian/man/kfaxview.1
index 48dc9f74d..48dc9f74d 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kfaxview.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kfaxview.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kghostview.1 b/ubuntu/_base/kdegraphics/debian/man/kghostview.1
index a29a2c025..a29a2c025 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kghostview.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kghostview.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kiconedit.1 b/ubuntu/_base/kdegraphics/debian/man/kiconedit.1
index a91a5c1de..a91a5c1de 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kiconedit.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kiconedit.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kolourpaint.1 b/ubuntu/_base/kdegraphics/debian/man/kolourpaint.1
index 3a736b48c..3a736b48c 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kolourpaint.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kolourpaint.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kooka.1 b/ubuntu/_base/kdegraphics/debian/man/kooka.1
index fc14a0984..fc14a0984 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kooka.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kooka.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kpdf.1 b/ubuntu/_base/kdegraphics/debian/man/kpdf.1
index 2b1ffaeeb..2b1ffaeeb 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kpdf.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kpdf.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kpovmodeler.1 b/ubuntu/_base/kdegraphics/debian/man/kpovmodeler.1
index ca14d57b8..ca14d57b8 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kpovmodeler.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kpovmodeler.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kruler.1 b/ubuntu/_base/kdegraphics/debian/man/kruler.1
index 617aef584..617aef584 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kruler.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kruler.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/ksnapshot.1 b/ubuntu/_base/kdegraphics/debian/man/ksnapshot.1
index abe516b09..abe516b09 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/ksnapshot.1
+++ b/ubuntu/_base/kdegraphics/debian/man/ksnapshot.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kuickshow.1 b/ubuntu/_base/kdegraphics/debian/man/kuickshow.1
index 2675eae4e..2675eae4e 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kuickshow.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kuickshow.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kview.1 b/ubuntu/_base/kdegraphics/debian/man/kview.1
index a506b7e20..a506b7e20 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kview.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kview.1
diff --git a/ubuntu/maverick/kdegraphics/debian/man/kviewshell.1 b/ubuntu/_base/kdegraphics/debian/man/kviewshell.1
index e9c762af2..e9c762af2 100644
--- a/ubuntu/maverick/kdegraphics/debian/man/kviewshell.1
+++ b/ubuntu/_base/kdegraphics/debian/man/kviewshell.1
diff --git a/ubuntu/maverick/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdegraphics/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdegraphics/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdegraphics/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdegraphics/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdegraphics/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdegraphics/debian/patches/series b/ubuntu/_base/kdegraphics/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdegraphics/debian/patches/series
+++ b/ubuntu/_base/kdegraphics/debian/patches/series
diff --git a/ubuntu/maverick/kdegraphics/debian/rules b/ubuntu/_base/kdegraphics/debian/rules
index 3a69a6d97..3a69a6d97 100755
--- a/ubuntu/maverick/kdegraphics/debian/rules
+++ b/ubuntu/_base/kdegraphics/debian/rules
diff --git a/ubuntu/maverick/kdegraphics/debian/source/format b/ubuntu/_base/kdegraphics/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdegraphics/debian/source/format
+++ b/ubuntu/_base/kdegraphics/debian/source/format
diff --git a/ubuntu/maverick/kdegraphics/debian/source/options b/ubuntu/_base/kdegraphics/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdegraphics/debian/source/options
+++ b/ubuntu/_base/kdegraphics/debian/source/options
diff --git a/ubuntu/maverick/kdelibs/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdelibs/debian/cdbs/debian-qt-kde.mk
index d29480355..d29480355 100644
--- a/ubuntu/maverick/kdelibs/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdelibs/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdelibs/debian/cdbs/kde.mk b/ubuntu/_base/kdelibs/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdelibs/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdelibs/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdelibs/debian/cdbs/versions.pl b/ubuntu/_base/kdelibs/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdelibs/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdelibs/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdelibs/debian/changelog b/ubuntu/_base/kdelibs/debian/changelog
index 9ff272180..9ff272180 100644
--- a/ubuntu/maverick/kdelibs/debian/changelog
+++ b/ubuntu/_base/kdelibs/debian/changelog
diff --git a/ubuntu/maverick/kdelibs/debian/compat b/ubuntu/_base/kdelibs/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdelibs/debian/compat
+++ b/ubuntu/_base/kdelibs/debian/compat
diff --git a/ubuntu/maverick/kdelibs/debian/control b/ubuntu/_base/kdelibs/debian/control
index 9d8b177bf..9d8b177bf 100644
--- a/ubuntu/maverick/kdelibs/debian/control
+++ b/ubuntu/_base/kdelibs/debian/control
diff --git a/ubuntu/maverick/kdelibs/debian/copyright b/ubuntu/_base/kdelibs/debian/copyright
index c622c0cf8..c622c0cf8 100644
--- a/ubuntu/maverick/kdelibs/debian/copyright
+++ b/ubuntu/_base/kdelibs/debian/copyright
diff --git a/ubuntu/maverick/kdelibs/debian/icons/aboutkde-kubuntu.png.uu b/ubuntu/_base/kdelibs/debian/icons/aboutkde-kubuntu.png.uu
index 9c8b56292..9c8b56292 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/aboutkde-kubuntu.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/aboutkde-kubuntu.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr128-device-system.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr128-device-system.png.uu
index 325c64f04..325c64f04 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr128-device-system.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr128-device-system.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr16-action-hibernate.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr16-action-hibernate.png.uu
index 42b17fafe..42b17fafe 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr16-action-hibernate.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr16-action-hibernate.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr16-action-suspend.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr16-action-suspend.png.uu
index 75a91ef03..75a91ef03 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr16-action-suspend.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr16-action-suspend.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr16-device-system.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr16-device-system.png.uu
index 7c3e44164..7c3e44164 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr16-device-system.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr16-device-system.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr22-action-hibernate.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr22-action-hibernate.png.uu
index 567d6ee12..567d6ee12 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr22-action-hibernate.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr22-action-hibernate.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr22-action-suspend.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr22-action-suspend.png.uu
index 59147edcf..59147edcf 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr22-action-suspend.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr22-action-suspend.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr22-device-system.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr22-device-system.png.uu
index e8840ff4d..e8840ff4d 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr22-device-system.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr22-device-system.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr32-action-hibernate.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr32-action-hibernate.png.uu
index 7999fe293..7999fe293 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr32-action-hibernate.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr32-action-hibernate.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr32-action-suspend.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr32-action-suspend.png.uu
index 239f329fe..239f329fe 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr32-action-suspend.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr32-action-suspend.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr32-device-system.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr32-device-system.png.uu
index 4d4de6b7a..4d4de6b7a 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr32-device-system.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr32-device-system.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr48-action-hibernate.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr48-action-hibernate.png.uu
index 0cbac6155..0cbac6155 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr48-action-hibernate.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr48-action-hibernate.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr48-action-suspend.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr48-action-suspend.png.uu
index 7682a4e9f..7682a4e9f 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr48-action-suspend.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr48-action-suspend.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr48-device-system.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr48-device-system.png.uu
index e33e7324f..e33e7324f 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr48-device-system.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr48-device-system.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/cr64-device-system.png.uu b/ubuntu/_base/kdelibs/debian/icons/cr64-device-system.png.uu
index b336ffede..b336ffede 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/cr64-device-system.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/cr64-device-system.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/crsc-device-system.svgz.uu b/ubuntu/_base/kdelibs/debian/icons/crsc-device-system.svgz.uu
index b8242b896..b8242b896 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/crsc-device-system.svgz.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/crsc-device-system.svgz.uu
diff --git a/ubuntu/maverick/kdelibs/debian/icons/launchpad.png.uu b/ubuntu/_base/kdelibs/debian/icons/launchpad.png.uu
index 854548828..854548828 100644
--- a/ubuntu/maverick/kdelibs/debian/icons/launchpad.png.uu
+++ b/ubuntu/_base/kdelibs/debian/icons/launchpad.png.uu
diff --git a/ubuntu/maverick/kdelibs/debian/kcmshell b/ubuntu/_base/kdelibs/debian/kcmshell
index 64dea7e87..64dea7e87 100755
--- a/ubuntu/maverick/kdelibs/debian/kcmshell
+++ b/ubuntu/_base/kdelibs/debian/kcmshell
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.install
index 64ab8e4c8..64ab8e4c8 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install
+++ b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.install
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.links b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.links
index 3b0f1cdf4..3b0f1cdf4 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.links
+++ b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.links
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.postinst b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.postinst
index f2a8d925b..f2a8d925b 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.postinst
+++ b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.postinst
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.postrm b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.postrm
index aae9f3600..aae9f3600 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.postrm
+++ b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.postrm
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.preinst b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.preinst
index 452b17bfc..452b17bfc 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.preinst
+++ b/ubuntu/_base/kdelibs/debian/kdelibs-data-trinity.preinst
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs-trinity.presubj b/ubuntu/_base/kdelibs/debian/kdelibs-trinity.presubj
index d87db2dd4..d87db2dd4 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs-trinity.presubj
+++ b/ubuntu/_base/kdelibs/debian/kdelibs-trinity.presubj
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.docs b/ubuntu/_base/kdelibs/debian/kdelibs4-trinity-dev.docs
index 3d802584c..3d802584c 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.docs
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4-trinity-dev.docs
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.install b/ubuntu/_base/kdelibs/debian/kdelibs4-trinity-dev.install
index 10607cdf8..10607cdf8 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.install
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4-trinity-dev.install
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.manpages b/ubuntu/_base/kdelibs/debian/kdelibs4-trinity-dev.manpages
index af14a7e71..af14a7e71 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-dev.manpages
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4-trinity-dev.manpages
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-doc.install b/ubuntu/_base/kdelibs/debian/kdelibs4-trinity-doc.install
index bbc48fffa..bbc48fffa 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4-trinity-doc.install
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4-trinity-doc.install
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.docs b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.docs
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.docs
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.install
index 4c8be8e62..4c8be8e62 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.install
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.install
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.lintian b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.lintian
index 7918aa780..7918aa780 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.lintian
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.lintian
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.manpages b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.manpages
index eba677adb..eba677adb 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.manpages
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.manpages
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.postinst b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.postinst
index 6dbf5d9e1..6dbf5d9e1 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.postinst
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.postinst
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.presubj b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.presubj
index d87db2dd4..d87db2dd4 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.presubj
+++ b/ubuntu/_base/kdelibs/debian/kdelibs4c2a-trinity.presubj
diff --git a/ubuntu/maverick/kdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl b/ubuntu/_base/kdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
index 1705e7d4f..1705e7d4f 100644
--- a/ubuntu/maverick/kdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
+++ b/ubuntu/_base/kdelibs/debian/kubuntu-desktop-i18n/createdesktop.pl
diff --git a/ubuntu/maverick/kdelibs/debian/kubuntu-desktop-i18n/findfiles b/ubuntu/_base/kdelibs/debian/kubuntu-desktop-i18n/findfiles
index 59a1d97a2..59a1d97a2 100644
--- a/ubuntu/maverick/kdelibs/debian/kubuntu-desktop-i18n/findfiles
+++ b/ubuntu/_base/kdelibs/debian/kubuntu-desktop-i18n/findfiles
diff --git a/ubuntu/maverick/kdelibs/debian/kubuntu-desktop-i18n/msgsplit b/ubuntu/_base/kdelibs/debian/kubuntu-desktop-i18n/msgsplit
index 98789a47f..98789a47f 100644
--- a/ubuntu/maverick/kdelibs/debian/kubuntu-desktop-i18n/msgsplit
+++ b/ubuntu/_base/kdelibs/debian/kubuntu-desktop-i18n/msgsplit
diff --git a/ubuntu/maverick/kdelibs/debian/man/artsmessage-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/artsmessage-trinity.sgml
index 2d5d6dba8..2d5d6dba8 100644
--- a/ubuntu/maverick/kdelibs/debian/man/artsmessage-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/artsmessage-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/cupsdconf-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/cupsdconf-trinity.sgml
index 425b2e89b..425b2e89b 100644
--- a/ubuntu/maverick/kdelibs/debian/man/cupsdconf-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/cupsdconf-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/cupsdoprint-trinity.1 b/ubuntu/_base/kdelibs/debian/man/cupsdoprint-trinity.1
index a79649057..a79649057 100644
--- a/ubuntu/maverick/kdelibs/debian/man/cupsdoprint-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/cupsdoprint-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/dcop-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/dcop-trinity.sgml
index 0c80c88a1..0c80c88a1 100644
--- a/ubuntu/maverick/kdelibs/debian/man/dcop-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/dcop-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/dcopclient-trinity.1 b/ubuntu/_base/kdelibs/debian/man/dcopclient-trinity.1
index 911e0c0a4..911e0c0a4 100644
--- a/ubuntu/maverick/kdelibs/debian/man/dcopclient-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/dcopclient-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/dcopfind-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/dcopfind-trinity.sgml
index 5aeb03ce0..5aeb03ce0 100644
--- a/ubuntu/maverick/kdelibs/debian/man/dcopfind-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/dcopfind-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/dcopobject-trinity.1 b/ubuntu/_base/kdelibs/debian/man/dcopobject-trinity.1
index 24ac94724..24ac94724 100644
--- a/ubuntu/maverick/kdelibs/debian/man/dcopobject-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/dcopobject-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/dcopquit-trinity.1 b/ubuntu/_base/kdelibs/debian/man/dcopquit-trinity.1
index d9e967f22..d9e967f22 100644
--- a/ubuntu/maverick/kdelibs/debian/man/dcopquit-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/dcopquit-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/dcopref-trinity.1 b/ubuntu/_base/kdelibs/debian/man/dcopref-trinity.1
index 1ebbe236e..1ebbe236e 100644
--- a/ubuntu/maverick/kdelibs/debian/man/dcopref-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/dcopref-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/dcopserver-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/dcopserver-trinity.sgml
index d58267994..d58267994 100644
--- a/ubuntu/maverick/kdelibs/debian/man/dcopserver-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/dcopserver-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/dcopserver_shutdown-trinity.1 b/ubuntu/_base/kdelibs/debian/man/dcopserver_shutdown-trinity.1
index 51993a027..51993a027 100644
--- a/ubuntu/maverick/kdelibs/debian/man/dcopserver_shutdown-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/dcopserver_shutdown-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/dcopstart-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/dcopstart-trinity.sgml
index 48b0a050d..48b0a050d 100644
--- a/ubuntu/maverick/kdelibs/debian/man/dcopstart-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/dcopstart-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/fileshareset-trinity.1 b/ubuntu/_base/kdelibs/debian/man/fileshareset-trinity.1
index 32cf55c8f..32cf55c8f 100644
--- a/ubuntu/maverick/kdelibs/debian/man/fileshareset-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/fileshareset-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/imagetops-trinity.1 b/ubuntu/_base/kdelibs/debian/man/imagetops-trinity.1
index d169ae5d5..d169ae5d5 100644
--- a/ubuntu/maverick/kdelibs/debian/man/imagetops-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/imagetops-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kab2kabc-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kab2kabc-trinity.1
index cc7b69e98..cc7b69e98 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kab2kabc-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kab2kabc-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kaddprinterwizard-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kaddprinterwizard-trinity.sgml
index 4550e825c..4550e825c 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kaddprinterwizard-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kaddprinterwizard-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kbuildsycoca-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kbuildsycoca-trinity.sgml
index 92749d8ad..92749d8ad 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kbuildsycoca-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kbuildsycoca-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kcmshell-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kcmshell-trinity.1
index f94a9a670..f94a9a670 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kcmshell-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kcmshell-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kconf_update-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kconf_update-trinity.sgml
index e7f29733a..e7f29733a 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kconf_update-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kconf_update-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kconfig_compiler-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kconfig_compiler-trinity.1
index eab4596ed..eab4596ed 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kconfig_compiler-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kconfig_compiler-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kcookiejar-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kcookiejar-trinity.sgml
index 7cf48046f..7cf48046f 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kcookiejar-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kcookiejar-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kde-config-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kde-config-trinity.sgml
index 7be0ec30c..7be0ec30c 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kde-config-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kde-config-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kde-menu-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kde-menu-trinity.1
index 29d6191f4..29d6191f4 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kde-menu-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kde-menu-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kded-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kded-trinity.sgml
index e14dc5c06..e14dc5c06 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kded-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kded-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kdeinit-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kdeinit-trinity.1
index 1e1e10adf..1e1e10adf 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kdeinit-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kdeinit-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kdeinit_shutdown-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kdeinit_shutdown-trinity.1
index 11081656a..11081656a 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kdeinit_shutdown-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kdeinit_shutdown-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kdesu_stub-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kdesu_stub-trinity.1
index 7a3800513..7a3800513 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kdesu_stub-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kdesu_stub-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kdontchangethehostname-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kdontchangethehostname-trinity.sgml
index 4bb8117a7..4bb8117a7 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kdontchangethehostname-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kdontchangethehostname-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kfile-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kfile-trinity.sgml
index d5239142d..d5239142d 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kfile-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kfile-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kgrantpty-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kgrantpty-trinity.1
index dba0cb67c..dba0cb67c 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kgrantpty-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kgrantpty-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/khotnewstuff-trinity.1 b/ubuntu/_base/kdelibs/debian/man/khotnewstuff-trinity.1
index 68421378d..68421378d 100644
--- a/ubuntu/maverick/kdelibs/debian/man/khotnewstuff-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/khotnewstuff-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kinstalltheme-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kinstalltheme-trinity.sgml
index ba44a533f..ba44a533f 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kinstalltheme-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kinstalltheme-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kio_http_cache_cleaner-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kio_http_cache_cleaner-trinity.sgml
index d94156a3f..d94156a3f 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kio_http_cache_cleaner-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kio_http_cache_cleaner-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kio_uiserver-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kio_uiserver-trinity.sgml
index 753ca4f70..753ca4f70 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kio_uiserver-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kio_uiserver-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kioexec-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kioexec-trinity.1
index d4e63ffad..d4e63ffad 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kioexec-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kioexec-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/klauncher-trinity.1 b/ubuntu/_base/kdelibs/debian/man/klauncher-trinity.1
index f8274aea6..f8274aea6 100644
--- a/ubuntu/maverick/kdelibs/debian/man/klauncher-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/klauncher-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kmailservice-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/kmailservice-trinity.sgml
index 506038dee..506038dee 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kmailservice-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/kmailservice-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kpac_dhcp_helper-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kpac_dhcp_helper-trinity.1
index 3182b311a..3182b311a 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kpac_dhcp_helper-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kpac_dhcp_helper-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/ksendbugmail-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/ksendbugmail-trinity.sgml
index 8276bf477..8276bf477 100644
--- a/ubuntu/maverick/kdelibs/debian/man/ksendbugmail-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/ksendbugmail-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/kshell-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kshell-trinity.1
index acbe215c8..acbe215c8 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kshell-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kshell-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kstartupconfig-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kstartupconfig-trinity.1
index dca82fb5e..dca82fb5e 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kstartupconfig-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kstartupconfig-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/ksvgtopng-trinity.1 b/ubuntu/_base/kdelibs/debian/man/ksvgtopng-trinity.1
index ec5745095..ec5745095 100644
--- a/ubuntu/maverick/kdelibs/debian/man/ksvgtopng-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/ksvgtopng-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/ktelnetservice-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/ktelnetservice-trinity.sgml
index 3f1ceebdc..3f1ceebdc 100644
--- a/ubuntu/maverick/kdelibs/debian/man/ktelnetservice-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/ktelnetservice-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/ktradertest-trinity.1 b/ubuntu/_base/kdelibs/debian/man/ktradertest-trinity.1
index 62c5521ad..62c5521ad 100644
--- a/ubuntu/maverick/kdelibs/debian/man/ktradertest-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/ktradertest-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/kunittestmodrunner-trinity.1 b/ubuntu/_base/kdelibs/debian/man/kunittestmodrunner-trinity.1
index b61b06654..b61b06654 100644
--- a/ubuntu/maverick/kdelibs/debian/man/kunittestmodrunner-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/kunittestmodrunner-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/lnusertemp-trinity.sgml
index c40c64520..c40c64520 100644
--- a/ubuntu/maverick/kdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/lnusertemp-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/make_driver_db_cups-trinity.1 b/ubuntu/_base/kdelibs/debian/man/make_driver_db_cups-trinity.1
index e4eb8251f..e4eb8251f 100644
--- a/ubuntu/maverick/kdelibs/debian/man/make_driver_db_cups-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/make_driver_db_cups-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/make_driver_db_lpr-trinity.1 b/ubuntu/_base/kdelibs/debian/man/make_driver_db_lpr-trinity.1
index 92708abae..92708abae 100644
--- a/ubuntu/maverick/kdelibs/debian/man/make_driver_db_lpr-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/make_driver_db_lpr-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/makekdewidgets-trinity.1 b/ubuntu/_base/kdelibs/debian/man/makekdewidgets-trinity.1
index 1f91b9a4c..1f91b9a4c 100644
--- a/ubuntu/maverick/kdelibs/debian/man/makekdewidgets-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/makekdewidgets-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/man/meinproc-trinity.sgml b/ubuntu/_base/kdelibs/debian/man/meinproc-trinity.sgml
index e1cb2bf03..e1cb2bf03 100644
--- a/ubuntu/maverick/kdelibs/debian/man/meinproc-trinity.sgml
+++ b/ubuntu/_base/kdelibs/debian/man/meinproc-trinity.sgml
diff --git a/ubuntu/maverick/kdelibs/debian/man/preparetips-trinity.1 b/ubuntu/_base/kdelibs/debian/man/preparetips-trinity.1
index 241444a40..241444a40 100644
--- a/ubuntu/maverick/kdelibs/debian/man/preparetips-trinity.1
+++ b/ubuntu/_base/kdelibs/debian/man/preparetips-trinity.1
diff --git a/ubuntu/maverick/kdelibs/debian/not-installed.list b/ubuntu/_base/kdelibs/debian/not-installed.list
index ad8dd66b4..ad8dd66b4 100644
--- a/ubuntu/maverick/kdelibs/debian/not-installed.list
+++ b/ubuntu/_base/kdelibs/debian/not-installed.list
diff --git a/ubuntu/maverick/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/_base/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
index 715b2bd22..715b2bd22 100644
--- a/ubuntu/maverick/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
+++ b/ubuntu/_base/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff
diff --git a/ubuntu/maverick/kdelibs/debian/patches/series b/ubuntu/_base/kdelibs/debian/patches/series
index b5490e13d..b5490e13d 100644
--- a/ubuntu/maverick/kdelibs/debian/patches/series
+++ b/ubuntu/_base/kdelibs/debian/patches/series
diff --git a/ubuntu/maverick/kdelibs/debian/prune-nonfree b/ubuntu/_base/kdelibs/debian/prune-nonfree
index cb24b5db4..cb24b5db4 100644
--- a/ubuntu/maverick/kdelibs/debian/prune-nonfree
+++ b/ubuntu/_base/kdelibs/debian/prune-nonfree
diff --git a/ubuntu/maverick/kdelibs/debian/rules b/ubuntu/_base/kdelibs/debian/rules
index c6df5db9e..c6df5db9e 100755
--- a/ubuntu/maverick/kdelibs/debian/rules
+++ b/ubuntu/_base/kdelibs/debian/rules
diff --git a/ubuntu/maverick/kdelibs/debian/source/format b/ubuntu/_base/kdelibs/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdelibs/debian/source/format
+++ b/ubuntu/_base/kdelibs/debian/source/format
diff --git a/ubuntu/maverick/kdelibs/debian/source/options b/ubuntu/_base/kdelibs/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdelibs/debian/source/options
+++ b/ubuntu/_base/kdelibs/debian/source/options
diff --git a/ubuntu/maverick/kdelibs/debian/trinitylibs.conf b/ubuntu/_base/kdelibs/debian/trinitylibs.conf
index 4158c0679..4158c0679 100644
--- a/ubuntu/maverick/kdelibs/debian/trinitylibs.conf
+++ b/ubuntu/_base/kdelibs/debian/trinitylibs.conf
diff --git a/ubuntu/maverick/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/_base/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
index b643a5ee2..b643a5ee2 100644
--- a/ubuntu/maverick/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/_base/kdemultimedia/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/ubuntu/maverick/kdemultimedia/debian/artsbuilder-trinity.install b/ubuntu/_base/kdemultimedia/debian/artsbuilder-trinity.install
index b3f11c769..b3f11c769 100644
--- a/ubuntu/maverick/kdemultimedia/debian/artsbuilder-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/artsbuilder-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/artsbuilder-trinity.menu b/ubuntu/_base/kdemultimedia/debian/artsbuilder-trinity.menu
index 8f8a1c989..8f8a1c989 100644
--- a/ubuntu/maverick/kdemultimedia/debian/artsbuilder-trinity.menu
+++ b/ubuntu/_base/kdemultimedia/debian/artsbuilder-trinity.menu
diff --git a/ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdemultimedia/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdemultimedia/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdemultimedia/debian/cdbs/kde.mk b/ubuntu/_base/kdemultimedia/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdemultimedia/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdemultimedia/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdemultimedia/debian/cdbs/versions.pl b/ubuntu/_base/kdemultimedia/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdemultimedia/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdemultimedia/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdemultimedia/debian/changelog b/ubuntu/_base/kdemultimedia/debian/changelog
index b169a5838..b169a5838 100644
--- a/ubuntu/maverick/kdemultimedia/debian/changelog
+++ b/ubuntu/_base/kdemultimedia/debian/changelog
diff --git a/ubuntu/maverick/kdemultimedia/debian/compat b/ubuntu/_base/kdemultimedia/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdemultimedia/debian/compat
+++ b/ubuntu/_base/kdemultimedia/debian/compat
diff --git a/ubuntu/maverick/kdemultimedia/debian/control b/ubuntu/_base/kdemultimedia/debian/control
index 2216d2e11..2216d2e11 100644
--- a/ubuntu/maverick/kdemultimedia/debian/control
+++ b/ubuntu/_base/kdemultimedia/debian/control
diff --git a/ubuntu/maverick/kdemultimedia/debian/copyright b/ubuntu/_base/kdemultimedia/debian/copyright
index 8957d914a..8957d914a 100644
--- a/ubuntu/maverick/kdemultimedia/debian/copyright
+++ b/ubuntu/_base/kdemultimedia/debian/copyright
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/artsbuilder.xpm b/ubuntu/_base/kdemultimedia/debian/icons/artsbuilder.xpm
index 8f5bd016b..8f5bd016b 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/artsbuilder.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/artsbuilder.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/artscontrol.xpm b/ubuntu/_base/kdemultimedia/debian/icons/artscontrol.xpm
index b37b1e650..b37b1e650 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/artscontrol.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/artscontrol.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/juk-16.xpm b/ubuntu/_base/kdemultimedia/debian/icons/juk-16.xpm
index 2b17c6068..2b17c6068 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/juk-16.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/juk-16.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/juk.xpm b/ubuntu/_base/kdemultimedia/debian/icons/juk.xpm
index 30498a68b..30498a68b 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/juk.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/juk.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kaboodle-16.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kaboodle-16.xpm
index 4f4184dd1..4f4184dd1 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kaboodle-16.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kaboodle-16.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kaboodle.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kaboodle.xpm
index ab04a15f2..ab04a15f2 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kaboodle.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kaboodle.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kaudiocreator-16.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kaudiocreator-16.xpm
index 50b98352c..50b98352c 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kaudiocreator-16.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kaudiocreator-16.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kaudiocreator.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kaudiocreator.xpm
index 223436043..223436043 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kaudiocreator.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kaudiocreator.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kmid-16.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kmid-16.xpm
index 0a510090a..0a510090a 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kmid-16.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kmid-16.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kmid.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kmid.xpm
index fb669aa72..fb669aa72 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kmid.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kmid.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kmix-16.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kmix-16.xpm
index 58c2b675d..58c2b675d 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kmix-16.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kmix-16.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kmix.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kmix.xpm
index 0c04abfc8..0c04abfc8 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kmix.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kmix.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/krec-16.xpm b/ubuntu/_base/kdemultimedia/debian/icons/krec-16.xpm
index 9db4ba58e..9db4ba58e 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/krec-16.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/krec-16.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/krec.xpm b/ubuntu/_base/kdemultimedia/debian/icons/krec.xpm
index 108634685..108634685 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/krec.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/krec.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kscd-16.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kscd-16.xpm
index 8e279b754..8e279b754 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kscd-16.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kscd-16.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/kscd.xpm b/ubuntu/_base/kdemultimedia/debian/icons/kscd.xpm
index b21878949..b21878949 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/kscd.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/kscd.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/noatun-16.xpm b/ubuntu/_base/kdemultimedia/debian/icons/noatun-16.xpm
index fe4639857..fe4639857 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/noatun-16.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/noatun-16.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/icons/noatun.xpm b/ubuntu/_base/kdemultimedia/debian/icons/noatun.xpm
index 10c085be5..10c085be5 100644
--- a/ubuntu/maverick/kdemultimedia/debian/icons/noatun.xpm
+++ b/ubuntu/_base/kdemultimedia/debian/icons/noatun.xpm
diff --git a/ubuntu/maverick/kdemultimedia/debian/juk-trinity.install b/ubuntu/_base/kdemultimedia/debian/juk-trinity.install
index 39ffc23e4..39ffc23e4 100644
--- a/ubuntu/maverick/kdemultimedia/debian/juk-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/juk-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/juk-trinity.manpages b/ubuntu/_base/kdemultimedia/debian/juk-trinity.manpages
index cc1b91a74..cc1b91a74 100644
--- a/ubuntu/maverick/kdemultimedia/debian/juk-trinity.manpages
+++ b/ubuntu/_base/kdemultimedia/debian/juk-trinity.manpages
diff --git a/ubuntu/maverick/kdemultimedia/debian/juk-trinity.menu b/ubuntu/_base/kdemultimedia/debian/juk-trinity.menu
index b8af14259..b8af14259 100644
--- a/ubuntu/maverick/kdemultimedia/debian/juk-trinity.menu
+++ b/ubuntu/_base/kdemultimedia/debian/juk-trinity.menu
diff --git a/ubuntu/maverick/kdemultimedia/debian/kaboodle-trinity.install b/ubuntu/_base/kdemultimedia/debian/kaboodle-trinity.install
index dbf9019c1..dbf9019c1 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kaboodle-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/kaboodle-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/kaboodle-trinity.manpages b/ubuntu/_base/kdemultimedia/debian/kaboodle-trinity.manpages
index 56aa78551..56aa78551 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kaboodle-trinity.manpages
+++ b/ubuntu/_base/kdemultimedia/debian/kaboodle-trinity.manpages
diff --git a/ubuntu/maverick/kdemultimedia/debian/kaboodle-trinity.menu b/ubuntu/_base/kdemultimedia/debian/kaboodle-trinity.menu
index 23e507270..23e507270 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kaboodle-trinity.menu
+++ b/ubuntu/_base/kdemultimedia/debian/kaboodle-trinity.menu
diff --git a/ubuntu/maverick/kdemultimedia/debian/kaudiocreator-trinity.install b/ubuntu/_base/kdemultimedia/debian/kaudiocreator-trinity.install
index a21cdff62..a21cdff62 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kaudiocreator-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/kaudiocreator-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/kaudiocreator-trinity.manpages b/ubuntu/_base/kdemultimedia/debian/kaudiocreator-trinity.manpages
index e3f09d6dd..e3f09d6dd 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kaudiocreator-trinity.manpages
+++ b/ubuntu/_base/kdemultimedia/debian/kaudiocreator-trinity.manpages
diff --git a/ubuntu/maverick/kdemultimedia/debian/kaudiocreator-trinity.menu b/ubuntu/_base/kdemultimedia/debian/kaudiocreator-trinity.menu
index 3dea45352..3dea45352 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kaudiocreator-trinity.menu
+++ b/ubuntu/_base/kdemultimedia/debian/kaudiocreator-trinity.menu
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder
index c661b6109..c661b6109 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.artsbuilder
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk
index 7b5e13806..7b5e13806 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.juk
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle
index 5082b485a..5082b485a 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kaboodle
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid
index d704ec59a..d704ec59a 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmid
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix
index dfaa37564..dfaa37564 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kmix
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec
index 74599736b..74599736b 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.krec
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd
index 0bbe1bea0..0bbe1bea0 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.kscd
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun
index e93051e94..e93051e94 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-doc-html.doc-base.noatun
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install
index 26d0fa3c8..26d0fa3c8 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-kappfinder-data-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
index 422efd2a4..422efd2a4 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
index 9f7c1bd94..9f7c1bd94 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-trinity-dev.install b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-trinity-dev.install
index 343efda6f..343efda6f 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kdemultimedia-trinity-dev.install
+++ b/ubuntu/_base/kdemultimedia/debian/kdemultimedia-trinity-dev.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/kmid-trinity.install b/ubuntu/_base/kdemultimedia/debian/kmid-trinity.install
index 00d66fa05..00d66fa05 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kmid-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/kmid-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/kmid-trinity.menu b/ubuntu/_base/kdemultimedia/debian/kmid-trinity.menu
index 03e2ae87f..03e2ae87f 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kmid-trinity.menu
+++ b/ubuntu/_base/kdemultimedia/debian/kmid-trinity.menu
diff --git a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.install b/ubuntu/_base/kdemultimedia/debian/kmix-trinity.install
index 61f017aa6..61f017aa6 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/kmix-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.lintian b/ubuntu/_base/kdemultimedia/debian/kmix-trinity.lintian
index 8f1fe3f4e..8f1fe3f4e 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/_base/kdemultimedia/debian/kmix-trinity.lintian
diff --git a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.manpages b/ubuntu/_base/kdemultimedia/debian/kmix-trinity.manpages
index e0adce8b6..e0adce8b6 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.manpages
+++ b/ubuntu/_base/kdemultimedia/debian/kmix-trinity.manpages
diff --git a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.menu b/ubuntu/_base/kdemultimedia/debian/kmix-trinity.menu
index 4f49f0f34..4f49f0f34 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.menu
+++ b/ubuntu/_base/kdemultimedia/debian/kmix-trinity.menu
diff --git a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.install b/ubuntu/_base/kdemultimedia/debian/krec-trinity.install
index dd5a18756..dd5a18756 100644
--- a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/krec-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.lintian b/ubuntu/_base/kdemultimedia/debian/krec-trinity.lintian
index b59ed3df8..b59ed3df8 100644
--- a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/_base/kdemultimedia/debian/krec-trinity.lintian
diff --git a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.manpages b/ubuntu/_base/kdemultimedia/debian/krec-trinity.manpages
index 8a59c57a8..8a59c57a8 100644
--- a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.manpages
+++ b/ubuntu/_base/kdemultimedia/debian/krec-trinity.manpages
diff --git a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.menu b/ubuntu/_base/kdemultimedia/debian/krec-trinity.menu
index 4458fbd9b..4458fbd9b 100644
--- a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.menu
+++ b/ubuntu/_base/kdemultimedia/debian/krec-trinity.menu
diff --git a/ubuntu/maverick/kdemultimedia/debian/kscd-trinity.install b/ubuntu/_base/kdemultimedia/debian/kscd-trinity.install
index f1e5b53d8..f1e5b53d8 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kscd-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/kscd-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/kscd-trinity.menu b/ubuntu/_base/kdemultimedia/debian/kscd-trinity.menu
index 20acd8291..20acd8291 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kscd-trinity.menu
+++ b/ubuntu/_base/kdemultimedia/debian/kscd-trinity.menu
diff --git a/ubuntu/maverick/kdemultimedia/debian/libarts1-akode-trinity.install b/ubuntu/_base/kdemultimedia/debian/libarts1-akode-trinity.install
index 99a987715..99a987715 100644
--- a/ubuntu/maverick/kdemultimedia/debian/libarts1-akode-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/libarts1-akode-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/libarts1-audiofile-trinity.install b/ubuntu/_base/kdemultimedia/debian/libarts1-audiofile-trinity.install
index cb2eba97a..cb2eba97a 100644
--- a/ubuntu/maverick/kdemultimedia/debian/libarts1-audiofile-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/libarts1-audiofile-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/libarts1-audiofile-trinity.lintian b/ubuntu/_base/kdemultimedia/debian/libarts1-audiofile-trinity.lintian
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdemultimedia/debian/libarts1-audiofile-trinity.lintian
+++ b/ubuntu/_base/kdemultimedia/debian/libarts1-audiofile-trinity.lintian
diff --git a/ubuntu/maverick/kdemultimedia/debian/libarts1-mpeglib-trinity.install b/ubuntu/_base/kdemultimedia/debian/libarts1-mpeglib-trinity.install
index a4728ea10..a4728ea10 100644
--- a/ubuntu/maverick/kdemultimedia/debian/libarts1-mpeglib-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/libarts1-mpeglib-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/libarts1-xine-trinity.install b/ubuntu/_base/kdemultimedia/debian/libarts1-xine-trinity.install
index ab89af340..ab89af340 100644
--- a/ubuntu/maverick/kdemultimedia/debian/libarts1-xine-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/libarts1-xine-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/libarts1-xine-trinity.lintian b/ubuntu/_base/kdemultimedia/debian/libarts1-xine-trinity.lintian
index ef72447cf..ef72447cf 100644
--- a/ubuntu/maverick/kdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/ubuntu/_base/kdemultimedia/debian/libarts1-xine-trinity.lintian
diff --git a/ubuntu/maverick/kdemultimedia/debian/libkcddb1-trinity.install b/ubuntu/_base/kdemultimedia/debian/libkcddb1-trinity.install
index cece6d8da..cece6d8da 100644
--- a/ubuntu/maverick/kdemultimedia/debian/libkcddb1-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/libkcddb1-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/man/juk-trinity.1 b/ubuntu/_base/kdemultimedia/debian/man/juk-trinity.1
index 040844523..040844523 100644
--- a/ubuntu/maverick/kdemultimedia/debian/man/juk-trinity.1
+++ b/ubuntu/_base/kdemultimedia/debian/man/juk-trinity.1
diff --git a/ubuntu/maverick/kdemultimedia/debian/man/kaboodle-trinity.1 b/ubuntu/_base/kdemultimedia/debian/man/kaboodle-trinity.1
index c7852c5db..c7852c5db 100644
--- a/ubuntu/maverick/kdemultimedia/debian/man/kaboodle-trinity.1
+++ b/ubuntu/_base/kdemultimedia/debian/man/kaboodle-trinity.1
diff --git a/ubuntu/maverick/kdemultimedia/debian/man/kaudiocreator-trinity.1 b/ubuntu/_base/kdemultimedia/debian/man/kaudiocreator-trinity.1
index 4e0fb9433..4e0fb9433 100644
--- a/ubuntu/maverick/kdemultimedia/debian/man/kaudiocreator-trinity.1
+++ b/ubuntu/_base/kdemultimedia/debian/man/kaudiocreator-trinity.1
diff --git a/ubuntu/maverick/kdemultimedia/debian/man/kmix-trinity.1 b/ubuntu/_base/kdemultimedia/debian/man/kmix-trinity.1
index a5b2607f2..a5b2607f2 100644
--- a/ubuntu/maverick/kdemultimedia/debian/man/kmix-trinity.1
+++ b/ubuntu/_base/kdemultimedia/debian/man/kmix-trinity.1
diff --git a/ubuntu/maverick/kdemultimedia/debian/man/kmixctrl-trinity.1 b/ubuntu/_base/kdemultimedia/debian/man/kmixctrl-trinity.1
index 8b4602809..8b4602809 100644
--- a/ubuntu/maverick/kdemultimedia/debian/man/kmixctrl-trinity.1
+++ b/ubuntu/_base/kdemultimedia/debian/man/kmixctrl-trinity.1
diff --git a/ubuntu/maverick/kdemultimedia/debian/man/krec-trinity.1 b/ubuntu/_base/kdemultimedia/debian/man/krec-trinity.1
index 7528c7d68..7528c7d68 100644
--- a/ubuntu/maverick/kdemultimedia/debian/man/krec-trinity.1
+++ b/ubuntu/_base/kdemultimedia/debian/man/krec-trinity.1
diff --git a/ubuntu/maverick/kdemultimedia/debian/man/noatun-trinity.1 b/ubuntu/_base/kdemultimedia/debian/man/noatun-trinity.1
index e1fecd54b..e1fecd54b 100644
--- a/ubuntu/maverick/kdemultimedia/debian/man/noatun-trinity.1
+++ b/ubuntu/_base/kdemultimedia/debian/man/noatun-trinity.1
diff --git a/ubuntu/maverick/kdemultimedia/debian/mpeglib-trinity.install b/ubuntu/_base/kdemultimedia/debian/mpeglib-trinity.install
index c1340ecff..c1340ecff 100644
--- a/ubuntu/maverick/kdemultimedia/debian/mpeglib-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/mpeglib-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.install b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.install
index a25312c66..a25312c66 100644
--- a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.install
+++ b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.install
diff --git a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.lintian b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.lintian
index 27214f531..27214f531 100644
--- a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.lintian
+++ b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.lintian
diff --git a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.manpages b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.manpages
index e5196f799..e5196f799 100644
--- a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.manpages
+++ b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.manpages
diff --git a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.menu b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.menu
index a79589ace..a79589ace 100644
--- a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.menu
+++ b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.menu
diff --git a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.mime b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.mime
index 4b757de3d..4b757de3d 100644
--- a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.mime
+++ b/ubuntu/_base/kdemultimedia/debian/noatun-trinity.mime
diff --git a/ubuntu/maverick/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdemultimedia/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdemultimedia/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdemultimedia/debian/patches/series b/ubuntu/_base/kdemultimedia/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdemultimedia/debian/patches/series
+++ b/ubuntu/_base/kdemultimedia/debian/patches/series
diff --git a/ubuntu/maverick/kdemultimedia/debian/rules b/ubuntu/_base/kdemultimedia/debian/rules
index c7bbdcd71..c7bbdcd71 100755
--- a/ubuntu/maverick/kdemultimedia/debian/rules
+++ b/ubuntu/_base/kdemultimedia/debian/rules
diff --git a/ubuntu/maverick/kdemultimedia/debian/source/format b/ubuntu/_base/kdemultimedia/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdemultimedia/debian/source/format
+++ b/ubuntu/_base/kdemultimedia/debian/source/format
diff --git a/ubuntu/maverick/kdemultimedia/debian/source/options b/ubuntu/_base/kdemultimedia/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdemultimedia/debian/source/options
+++ b/ubuntu/_base/kdemultimedia/debian/source/options
diff --git a/ubuntu/maverick/kdenetwork/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/_base/kdenetwork/debian/KUBUNTU-DEBIAN-CHANGES
index fd40ff787..fd40ff787 100644
--- a/ubuntu/maverick/kdenetwork/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/_base/kdenetwork/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/ubuntu/maverick/kdenetwork/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdenetwork/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/ubuntu/maverick/kdenetwork/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdenetwork/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdenetwork/debian/cdbs/kde.mk b/ubuntu/_base/kdenetwork/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/kdenetwork/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdenetwork/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdenetwork/debian/cdbs/versions.pl b/ubuntu/_base/kdenetwork/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdenetwork/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdenetwork/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdenetwork/debian/changelog b/ubuntu/_base/kdenetwork/debian/changelog
index f7b828757..f7b828757 100644
--- a/ubuntu/maverick/kdenetwork/debian/changelog
+++ b/ubuntu/_base/kdenetwork/debian/changelog
diff --git a/ubuntu/maverick/kdenetwork/debian/compat b/ubuntu/_base/kdenetwork/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdenetwork/debian/compat
+++ b/ubuntu/_base/kdenetwork/debian/compat
diff --git a/ubuntu/maverick/kdenetwork/debian/control b/ubuntu/_base/kdenetwork/debian/control
index 550042c6b..550042c6b 100644
--- a/ubuntu/maverick/kdenetwork/debian/control
+++ b/ubuntu/_base/kdenetwork/debian/control
diff --git a/ubuntu/maverick/kdenetwork/debian/copyright b/ubuntu/_base/kdenetwork/debian/copyright
index 810eb4b73..810eb4b73 100644
--- a/ubuntu/maverick/kdenetwork/debian/copyright
+++ b/ubuntu/_base/kdenetwork/debian/copyright
diff --git a/ubuntu/maverick/kdenetwork/debian/dcoprss-trinity.install b/ubuntu/_base/kdenetwork/debian/dcoprss-trinity.install
index a167af8da..a167af8da 100644
--- a/ubuntu/maverick/kdenetwork/debian/dcoprss-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/dcoprss-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kdict-16.xpm b/ubuntu/_base/kdenetwork/debian/icons/kdict-16.xpm
index 19fecc4ff..19fecc4ff 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kdict-16.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kdict-16.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kdict.xpm b/ubuntu/_base/kdenetwork/debian/icons/kdict.xpm
index d0efc5cd1..d0efc5cd1 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kdict.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kdict.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kget-16.xpm b/ubuntu/_base/kdenetwork/debian/icons/kget-16.xpm
index e51ad05d9..e51ad05d9 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kget-16.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kget-16.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kget.xpm b/ubuntu/_base/kdenetwork/debian/icons/kget.xpm
index 79ed2262b..79ed2262b 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kget.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kget.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/knewsticker-16.xpm b/ubuntu/_base/kdenetwork/debian/icons/knewsticker-16.xpm
index aea3d8556..aea3d8556 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/knewsticker-16.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/knewsticker-16.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/knewsticker.xpm b/ubuntu/_base/kdenetwork/debian/icons/knewsticker.xpm
index 05030698a..05030698a 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/knewsticker.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/knewsticker.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kopete-16.xpm b/ubuntu/_base/kdenetwork/debian/icons/kopete-16.xpm
index b9ccda679..b9ccda679 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kopete-16.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kopete-16.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kopete.xpm b/ubuntu/_base/kdenetwork/debian/icons/kopete.xpm
index e996e096c..e996e096c 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kopete.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kopete.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kppp-16.xpm b/ubuntu/_base/kdenetwork/debian/icons/kppp-16.xpm
index 4bff6468d..4bff6468d 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kppp-16.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kppp-16.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kppp.xpm b/ubuntu/_base/kdenetwork/debian/icons/kppp.xpm
index 59b7f6823..59b7f6823 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kppp.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kppp.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/krdc-16.xpm b/ubuntu/_base/kdenetwork/debian/icons/krdc-16.xpm
index 0def168ad..0def168ad 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/krdc-16.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/krdc-16.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/krdc.xpm b/ubuntu/_base/kdenetwork/debian/icons/krdc.xpm
index 4ec5687cc..4ec5687cc 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/krdc.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/krdc.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/krfb-16.xpm b/ubuntu/_base/kdenetwork/debian/icons/krfb-16.xpm
index 469b0e91d..469b0e91d 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/krfb-16.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/krfb-16.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/krfb.xpm b/ubuntu/_base/kdenetwork/debian/icons/krfb.xpm
index 99bdfb1a0..99bdfb1a0 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/krfb.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/krfb.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/ksirc-16.xpm b/ubuntu/_base/kdenetwork/debian/icons/ksirc-16.xpm
index 3fdde4854..3fdde4854 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/ksirc-16.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/ksirc-16.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/ksirc.xpm b/ubuntu/_base/kdenetwork/debian/icons/ksirc.xpm
index 0e52bbec6..0e52bbec6 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/ksirc.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/ksirc.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kwifimanager-16.xpm b/ubuntu/_base/kdenetwork/debian/icons/kwifimanager-16.xpm
index c2e8390ae..c2e8390ae 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kwifimanager-16.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kwifimanager-16.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/icons/kwifimanager.xpm b/ubuntu/_base/kdenetwork/debian/icons/kwifimanager.xpm
index 8ed3c8790..8ed3c8790 100644
--- a/ubuntu/maverick/kdenetwork/debian/icons/kwifimanager.xpm
+++ b/ubuntu/_base/kdenetwork/debian/icons/kwifimanager.xpm
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict
index 337a83b09..337a83b09 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kdict
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget
index a200a52e0..a200a52e0 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kget
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker
index acdced484..acdced484 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.knewsticker
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete
index 87f02b01c..87f02b01c 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kopete
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf
index cc148e6f8..cc148e6f8 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kpf
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp
index 6ddfd1c40..6ddfd1c40 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kppp
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc
index 2de27f79b..2de27f79b 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.krdc
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb
index 3d6eea1f8..3d6eea1f8 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.krfb
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc
index b09f4a4c4..b09f4a4c4 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.ksirc
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd
index 92fa2c917..92fa2c917 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.ktalkd
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager
index af64e373a..af64e373a 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.kwifimanager
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa
index aaeabfd4c..aaeabfd4c 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-doc-html.doc-base.lisa
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-filesharing-trinity.install b/ubuntu/_base/kdenetwork/debian/kdenetwork-filesharing-trinity.install
index 4b0e9f5b9..4b0e9f5b9 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-filesharing-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-filesharing-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install b/ubuntu/_base/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
index b32a36440..b32a36440 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kdenetwork-trinity-dev.install b/ubuntu/_base/kdenetwork/debian/kdenetwork-trinity-dev.install
index daec5ae7d..daec5ae7d 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdenetwork-trinity-dev.install
+++ b/ubuntu/_base/kdenetwork/debian/kdenetwork-trinity-dev.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kdict-trinity.install b/ubuntu/_base/kdenetwork/debian/kdict-trinity.install
index cc46f268b..cc46f268b 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdict-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/kdict-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kdict-trinity.manpages b/ubuntu/_base/kdenetwork/debian/kdict-trinity.manpages
index 3128a0e9a..3128a0e9a 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdict-trinity.manpages
+++ b/ubuntu/_base/kdenetwork/debian/kdict-trinity.manpages
diff --git a/ubuntu/maverick/kdenetwork/debian/kdict-trinity.menu b/ubuntu/_base/kdenetwork/debian/kdict-trinity.menu
index 3bdad62c0..3bdad62c0 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdict-trinity.menu
+++ b/ubuntu/_base/kdenetwork/debian/kdict-trinity.menu
diff --git a/ubuntu/maverick/kdenetwork/debian/kdnssd-trinity.install b/ubuntu/_base/kdenetwork/debian/kdnssd-trinity.install
index 8d6a52c6b..8d6a52c6b 100644
--- a/ubuntu/maverick/kdenetwork/debian/kdnssd-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/kdnssd-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kget-trinity.install b/ubuntu/_base/kdenetwork/debian/kget-trinity.install
index 697f16e2e..697f16e2e 100644
--- a/ubuntu/maverick/kdenetwork/debian/kget-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/kget-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kget-trinity.manpages b/ubuntu/_base/kdenetwork/debian/kget-trinity.manpages
index 585b03129..585b03129 100644
--- a/ubuntu/maverick/kdenetwork/debian/kget-trinity.manpages
+++ b/ubuntu/_base/kdenetwork/debian/kget-trinity.manpages
diff --git a/ubuntu/maverick/kdenetwork/debian/kget-trinity.menu b/ubuntu/_base/kdenetwork/debian/kget-trinity.menu
index 9f46d2ca2..9f46d2ca2 100644
--- a/ubuntu/maverick/kdenetwork/debian/kget-trinity.menu
+++ b/ubuntu/_base/kdenetwork/debian/kget-trinity.menu
diff --git a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.install b/ubuntu/_base/kdenetwork/debian/knewsticker-trinity.install
index 11da896ac..11da896ac 100644
--- a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/knewsticker-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.lintian b/ubuntu/_base/kdenetwork/debian/knewsticker-trinity.lintian
index 566329697..566329697 100644
--- a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.lintian
+++ b/ubuntu/_base/kdenetwork/debian/knewsticker-trinity.lintian
diff --git a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.menu b/ubuntu/_base/kdenetwork/debian/knewsticker-trinity.menu
index c8eb2dd48..c8eb2dd48 100644
--- a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.menu
+++ b/ubuntu/_base/kdenetwork/debian/knewsticker-trinity.menu
diff --git a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.install b/ubuntu/_base/kdenetwork/debian/kopete-trinity.install
index 1907c3fc0..1907c3fc0 100644
--- a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/kopete-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.manpages b/ubuntu/_base/kdenetwork/debian/kopete-trinity.manpages
index 214a24d2e..214a24d2e 100644
--- a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.manpages
+++ b/ubuntu/_base/kdenetwork/debian/kopete-trinity.manpages
diff --git a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.menu b/ubuntu/_base/kdenetwork/debian/kopete-trinity.menu
index 4f809de8d..4f809de8d 100644
--- a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.menu
+++ b/ubuntu/_base/kdenetwork/debian/kopete-trinity.menu
diff --git a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.postinst b/ubuntu/_base/kdenetwork/debian/kopete-trinity.postinst
index 4ccb5ac4c..4ccb5ac4c 100644
--- a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.postinst
+++ b/ubuntu/_base/kdenetwork/debian/kopete-trinity.postinst
diff --git a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.prerm b/ubuntu/_base/kdenetwork/debian/kopete-trinity.prerm
index 4ee2b5d9d..4ee2b5d9d 100644
--- a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.prerm
+++ b/ubuntu/_base/kdenetwork/debian/kopete-trinity.prerm
diff --git a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.presubj b/ubuntu/_base/kdenetwork/debian/kopete-trinity.presubj
index d852c6c0d..d852c6c0d 100644
--- a/ubuntu/maverick/kdenetwork/debian/kopete-trinity.presubj
+++ b/ubuntu/_base/kdenetwork/debian/kopete-trinity.presubj
diff --git a/ubuntu/maverick/kdenetwork/debian/kpf-trinity.install b/ubuntu/_base/kdenetwork/debian/kpf-trinity.install
index 34db30cb4..34db30cb4 100644
--- a/ubuntu/maverick/kdenetwork/debian/kpf-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/kpf-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kppp-options b/ubuntu/_base/kdenetwork/debian/kppp-options
index 32ec05f0e..32ec05f0e 100644
--- a/ubuntu/maverick/kdenetwork/debian/kppp-options
+++ b/ubuntu/_base/kdenetwork/debian/kppp-options
diff --git a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.README.Debian b/ubuntu/_base/kdenetwork/debian/kppp-trinity.README.Debian
index 8602c6647..8602c6647 100644
--- a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.README.Debian
+++ b/ubuntu/_base/kdenetwork/debian/kppp-trinity.README.Debian
diff --git a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.install b/ubuntu/_base/kdenetwork/debian/kppp-trinity.install
index a62b64605..a62b64605 100644
--- a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/kppp-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.lintian b/ubuntu/_base/kdenetwork/debian/kppp-trinity.lintian
index 5a3a22357..5a3a22357 100644
--- a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.lintian
+++ b/ubuntu/_base/kdenetwork/debian/kppp-trinity.lintian
diff --git a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.menu b/ubuntu/_base/kdenetwork/debian/kppp-trinity.menu
index 28837883b..28837883b 100644
--- a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.menu
+++ b/ubuntu/_base/kdenetwork/debian/kppp-trinity.menu
diff --git a/ubuntu/maverick/kdenetwork/debian/krdc-trinity.install b/ubuntu/_base/kdenetwork/debian/krdc-trinity.install
index 9eae4f4c4..9eae4f4c4 100644
--- a/ubuntu/maverick/kdenetwork/debian/krdc-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/krdc-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/krdc-trinity.menu b/ubuntu/_base/kdenetwork/debian/krdc-trinity.menu
index 3f81d8ace..3f81d8ace 100644
--- a/ubuntu/maverick/kdenetwork/debian/krdc-trinity.menu
+++ b/ubuntu/_base/kdenetwork/debian/krdc-trinity.menu
diff --git a/ubuntu/maverick/kdenetwork/debian/krfb-trinity.install b/ubuntu/_base/kdenetwork/debian/krfb-trinity.install
index 8b7e8ce67..8b7e8ce67 100644
--- a/ubuntu/maverick/kdenetwork/debian/krfb-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/krfb-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/krfb-trinity.menu b/ubuntu/_base/kdenetwork/debian/krfb-trinity.menu
index 17114ebb0..17114ebb0 100644
--- a/ubuntu/maverick/kdenetwork/debian/krfb-trinity.menu
+++ b/ubuntu/_base/kdenetwork/debian/krfb-trinity.menu
diff --git a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.install b/ubuntu/_base/kdenetwork/debian/ksirc-trinity.install
index 73e4f9086..73e4f9086 100644
--- a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/ksirc-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.lintian b/ubuntu/_base/kdenetwork/debian/ksirc-trinity.lintian
index 6256da4ce..6256da4ce 100644
--- a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/_base/kdenetwork/debian/ksirc-trinity.lintian
diff --git a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.menu b/ubuntu/_base/kdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..7d0ac36b3 100644
--- a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.menu
+++ b/ubuntu/_base/kdenetwork/debian/ksirc-trinity.menu
diff --git a/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.install b/ubuntu/_base/kdenetwork/debian/ktalkd-trinity.install
index 607417afa..607417afa 100644
--- a/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/ktalkd-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.postinst b/ubuntu/_base/kdenetwork/debian/ktalkd-trinity.postinst
index 44dfd6c24..44dfd6c24 100644
--- a/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.postinst
+++ b/ubuntu/_base/kdenetwork/debian/ktalkd-trinity.postinst
diff --git a/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.postrm b/ubuntu/_base/kdenetwork/debian/ktalkd-trinity.postrm
index 6c2b34cdc..6c2b34cdc 100644
--- a/ubuntu/maverick/kdenetwork/debian/ktalkd-trinity.postrm
+++ b/ubuntu/_base/kdenetwork/debian/ktalkd-trinity.postrm
diff --git a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.install b/ubuntu/_base/kdenetwork/debian/kwifimanager-trinity.install
index b14b1c99b..b14b1c99b 100644
--- a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/kwifimanager-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/_base/kdenetwork/debian/kwifimanager-trinity.lintian
index 1586f0f0a..1586f0f0a 100644
--- a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.lintian
+++ b/ubuntu/_base/kdenetwork/debian/kwifimanager-trinity.lintian
diff --git a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.manpages b/ubuntu/_base/kdenetwork/debian/kwifimanager-trinity.manpages
index 4f390510b..4f390510b 100644
--- a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.manpages
+++ b/ubuntu/_base/kdenetwork/debian/kwifimanager-trinity.manpages
diff --git a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.menu b/ubuntu/_base/kdenetwork/debian/kwifimanager-trinity.menu
index 8be926f6a..8be926f6a 100644
--- a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.menu
+++ b/ubuntu/_base/kdenetwork/debian/kwifimanager-trinity.menu
diff --git a/ubuntu/maverick/kdenetwork/debian/librss1-trinity.install b/ubuntu/_base/kdenetwork/debian/librss1-trinity.install
index d16201611..d16201611 100644
--- a/ubuntu/maverick/kdenetwork/debian/librss1-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/librss1-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.docs b/ubuntu/_base/kdenetwork/debian/lisa-trinity.docs
index 2a33a726f..2a33a726f 100644
--- a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.docs
+++ b/ubuntu/_base/kdenetwork/debian/lisa-trinity.docs
diff --git a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.init b/ubuntu/_base/kdenetwork/debian/lisa-trinity.init
index 4e5dfa113..4e5dfa113 100644
--- a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.init
+++ b/ubuntu/_base/kdenetwork/debian/lisa-trinity.init
diff --git a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.install b/ubuntu/_base/kdenetwork/debian/lisa-trinity.install
index 1a75e64db..1a75e64db 100644
--- a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.install
+++ b/ubuntu/_base/kdenetwork/debian/lisa-trinity.install
diff --git a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.manpages b/ubuntu/_base/kdenetwork/debian/lisa-trinity.manpages
index 306f0c52e..306f0c52e 100644
--- a/ubuntu/maverick/kdenetwork/debian/lisa-trinity.manpages
+++ b/ubuntu/_base/kdenetwork/debian/lisa-trinity.manpages
diff --git a/ubuntu/maverick/kdenetwork/debian/lisarc b/ubuntu/_base/kdenetwork/debian/lisarc
index 27a0c5f08..27a0c5f08 100644
--- a/ubuntu/maverick/kdenetwork/debian/lisarc
+++ b/ubuntu/_base/kdenetwork/debian/lisarc
diff --git a/ubuntu/maverick/kdenetwork/debian/man/kdict-trinity.1 b/ubuntu/_base/kdenetwork/debian/man/kdict-trinity.1
index 9c0b8daaa..9c0b8daaa 100644
--- a/ubuntu/maverick/kdenetwork/debian/man/kdict-trinity.1
+++ b/ubuntu/_base/kdenetwork/debian/man/kdict-trinity.1
diff --git a/ubuntu/maverick/kdenetwork/debian/man/kget-trinity.1 b/ubuntu/_base/kdenetwork/debian/man/kget-trinity.1
index acb34c941..acb34c941 100644
--- a/ubuntu/maverick/kdenetwork/debian/man/kget-trinity.1
+++ b/ubuntu/_base/kdenetwork/debian/man/kget-trinity.1
diff --git a/ubuntu/maverick/kdenetwork/debian/man/kopete-trinity.sgml b/ubuntu/_base/kdenetwork/debian/man/kopete-trinity.sgml
index e1bfb2900..e1bfb2900 100644
--- a/ubuntu/maverick/kdenetwork/debian/man/kopete-trinity.sgml
+++ b/ubuntu/_base/kdenetwork/debian/man/kopete-trinity.sgml
diff --git a/ubuntu/maverick/kdenetwork/debian/man/kwifimanager-trinity.1 b/ubuntu/_base/kdenetwork/debian/man/kwifimanager-trinity.1
index 11034e5aa..11034e5aa 100644
--- a/ubuntu/maverick/kdenetwork/debian/man/kwifimanager-trinity.1
+++ b/ubuntu/_base/kdenetwork/debian/man/kwifimanager-trinity.1
diff --git a/ubuntu/maverick/kdenetwork/debian/man/lisa-trinity.8 b/ubuntu/_base/kdenetwork/debian/man/lisa-trinity.8
index 9b3192e14..9b3192e14 100644
--- a/ubuntu/maverick/kdenetwork/debian/man/lisa-trinity.8
+++ b/ubuntu/_base/kdenetwork/debian/man/lisa-trinity.8
diff --git a/ubuntu/maverick/kdenetwork/debian/man/reslisa-trinity.8 b/ubuntu/_base/kdenetwork/debian/man/reslisa-trinity.8
index eb2ca8f48..eb2ca8f48 100644
--- a/ubuntu/maverick/kdenetwork/debian/man/reslisa-trinity.8
+++ b/ubuntu/_base/kdenetwork/debian/man/reslisa-trinity.8
diff --git a/ubuntu/maverick/kdenetwork/debian/not-installed.list b/ubuntu/_base/kdenetwork/debian/not-installed.list
index f73944ef7..f73944ef7 100644
--- a/ubuntu/maverick/kdenetwork/debian/not-installed.list
+++ b/ubuntu/_base/kdenetwork/debian/not-installed.list
diff --git a/ubuntu/maverick/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdenetwork/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdenetwork/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdenetwork/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdenetwork/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdenetwork/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdenetwork/debian/patches/series b/ubuntu/_base/kdenetwork/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdenetwork/debian/patches/series
+++ b/ubuntu/_base/kdenetwork/debian/patches/series
diff --git a/ubuntu/maverick/kdenetwork/debian/rules b/ubuntu/_base/kdenetwork/debian/rules
index 1b8ccc627..1b8ccc627 100755
--- a/ubuntu/maverick/kdenetwork/debian/rules
+++ b/ubuntu/_base/kdenetwork/debian/rules
diff --git a/ubuntu/maverick/kdenetwork/debian/source/format b/ubuntu/_base/kdenetwork/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdenetwork/debian/source/format
+++ b/ubuntu/_base/kdenetwork/debian/source/format
diff --git a/ubuntu/maverick/kdenetwork/debian/source/options b/ubuntu/_base/kdenetwork/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdenetwork/debian/source/options
+++ b/ubuntu/_base/kdenetwork/debian/source/options
diff --git a/ubuntu/maverick/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index a95d6a7aa..a95d6a7aa 100644
--- a/ubuntu/maverick/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdepim/debian/akregator-trinity.install b/ubuntu/_base/kdepim/debian/akregator-trinity.install
index 456a67e27..456a67e27 100644
--- a/ubuntu/maverick/kdepim/debian/akregator-trinity.install
+++ b/ubuntu/_base/kdepim/debian/akregator-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/akregator-trinity.manpages b/ubuntu/_base/kdepim/debian/akregator-trinity.manpages
index 04a056c6e..04a056c6e 100644
--- a/ubuntu/maverick/kdepim/debian/akregator-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/akregator-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/akregator-trinity.menu b/ubuntu/_base/kdepim/debian/akregator-trinity.menu
index 5007b658f..5007b658f 100644
--- a/ubuntu/maverick/kdepim/debian/akregator-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/akregator-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/bits/fcntl.h b/ubuntu/_base/kdepim/debian/bits/fcntl.h
index 342a533f1..342a533f1 100644
--- a/ubuntu/maverick/kdepim/debian/bits/fcntl.h
+++ b/ubuntu/_base/kdepim/debian/bits/fcntl.h
diff --git a/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdepim/debian/cdbs/debian-qt-kde.mk
index 3bd77b8f7..3bd77b8f7 100644
--- a/ubuntu/maverick/kdepim/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdepim/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdepim/debian/cdbs/kde.mk b/ubuntu/_base/kdepim/debian/cdbs/kde.mk
index f5d237249..f5d237249 100644
--- a/ubuntu/maverick/kdepim/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdepim/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdepim/debian/cdbs/versions.pl b/ubuntu/_base/kdepim/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdepim/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdepim/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdepim/debian/changelog b/ubuntu/_base/kdepim/debian/changelog
index 07408b96b..07408b96b 100644
--- a/ubuntu/maverick/kdepim/debian/changelog
+++ b/ubuntu/_base/kdepim/debian/changelog
diff --git a/ubuntu/maverick/kdepim/debian/compat b/ubuntu/_base/kdepim/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdepim/debian/compat
+++ b/ubuntu/_base/kdepim/debian/compat
diff --git a/ubuntu/maverick/kdepim/debian/control b/ubuntu/_base/kdepim/debian/control
index b36394a10..b36394a10 100644
--- a/ubuntu/maverick/kdepim/debian/control
+++ b/ubuntu/_base/kdepim/debian/control
diff --git a/ubuntu/maverick/kdepim/debian/copyright b/ubuntu/_base/kdepim/debian/copyright
index 708f6aa75..708f6aa75 100644
--- a/ubuntu/maverick/kdepim/debian/copyright
+++ b/ubuntu/_base/kdepim/debian/copyright
diff --git a/ubuntu/maverick/kdepim/debian/icons/akregator-16.xpm b/ubuntu/_base/kdepim/debian/icons/akregator-16.xpm
index 598317ae7..598317ae7 100644
--- a/ubuntu/maverick/kdepim/debian/icons/akregator-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/akregator-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/akregator.xpm b/ubuntu/_base/kdepim/debian/icons/akregator.xpm
index aaa0b5fe8..aaa0b5fe8 100644
--- a/ubuntu/maverick/kdepim/debian/icons/akregator.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/akregator.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kaddressbook-16.xpm b/ubuntu/_base/kdepim/debian/icons/kaddressbook-16.xpm
index 3ac635289..3ac635289 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kaddressbook-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kaddressbook-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kaddressbook.xpm b/ubuntu/_base/kdepim/debian/icons/kaddressbook.xpm
index 337082f14..337082f14 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kaddressbook.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kaddressbook.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kalarm-16.xpm b/ubuntu/_base/kdepim/debian/icons/kalarm-16.xpm
index 7ad36a097..7ad36a097 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kalarm-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kalarm-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kalarm.xpm b/ubuntu/_base/kdepim/debian/icons/kalarm.xpm
index 0b1e62950..0b1e62950 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kalarm.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kalarm.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kandy-16.xpm b/ubuntu/_base/kdepim/debian/icons/kandy-16.xpm
index 9d2361ce2..9d2361ce2 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kandy-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kandy-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kandy.xpm b/ubuntu/_base/kdepim/debian/icons/kandy.xpm
index 78fc91d9a..78fc91d9a 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kandy.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kandy.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/karm-16.xpm b/ubuntu/_base/kdepim/debian/icons/karm-16.xpm
index cddfe0e76..cddfe0e76 100644
--- a/ubuntu/maverick/kdepim/debian/icons/karm-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/karm-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/karm.xpm b/ubuntu/_base/kdepim/debian/icons/karm.xpm
index 38f832c9a..38f832c9a 100644
--- a/ubuntu/maverick/kdepim/debian/icons/karm.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/karm.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kmail-16.xpm b/ubuntu/_base/kdepim/debian/icons/kmail-16.xpm
index a387d347f..a387d347f 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kmail-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kmail-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kmail.xpm b/ubuntu/_base/kdepim/debian/icons/kmail.xpm
index dc0d1a689..dc0d1a689 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kmail.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kmail.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kmailcvt-16.xpm b/ubuntu/_base/kdepim/debian/icons/kmailcvt-16.xpm
index 1ab4abd6c..1ab4abd6c 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kmailcvt-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kmailcvt-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kmailcvt.xpm b/ubuntu/_base/kdepim/debian/icons/kmailcvt.xpm
index 25da3a69a..25da3a69a 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kmailcvt.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kmailcvt.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/knode-16.xpm b/ubuntu/_base/kdepim/debian/icons/knode-16.xpm
index 60516c0d6..60516c0d6 100644
--- a/ubuntu/maverick/kdepim/debian/icons/knode-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/knode-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/knode.xpm b/ubuntu/_base/kdepim/debian/icons/knode.xpm
index b0e8361ad..b0e8361ad 100644
--- a/ubuntu/maverick/kdepim/debian/icons/knode.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/knode.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/knotes-16.xpm b/ubuntu/_base/kdepim/debian/icons/knotes-16.xpm
index 0daa3ecfa..0daa3ecfa 100644
--- a/ubuntu/maverick/kdepim/debian/icons/knotes-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/knotes-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/knotes.xpm b/ubuntu/_base/kdepim/debian/icons/knotes.xpm
index 8c96be652..8c96be652 100644
--- a/ubuntu/maverick/kdepim/debian/icons/knotes.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/knotes.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kontact-16.xpm b/ubuntu/_base/kdepim/debian/icons/kontact-16.xpm
index 4332e2cc0..4332e2cc0 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kontact-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kontact-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kontact.xpm b/ubuntu/_base/kdepim/debian/icons/kontact.xpm
index 1b5e038b5..1b5e038b5 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kontact.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kontact.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/korganizer-16.xpm b/ubuntu/_base/kdepim/debian/icons/korganizer-16.xpm
index 5bba2637c..5bba2637c 100644
--- a/ubuntu/maverick/kdepim/debian/icons/korganizer-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/korganizer-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/korganizer.xpm b/ubuntu/_base/kdepim/debian/icons/korganizer.xpm
index 66693bfbb..66693bfbb 100644
--- a/ubuntu/maverick/kdepim/debian/icons/korganizer.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/korganizer.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/korn-16.xpm b/ubuntu/_base/kdepim/debian/icons/korn-16.xpm
index 33f993fb2..33f993fb2 100644
--- a/ubuntu/maverick/kdepim/debian/icons/korn-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/korn-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/korn.xpm b/ubuntu/_base/kdepim/debian/icons/korn.xpm
index cb518223e..cb518223e 100644
--- a/ubuntu/maverick/kdepim/debian/icons/korn.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/korn.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kpalmdoc-16.xpm b/ubuntu/_base/kdepim/debian/icons/kpalmdoc-16.xpm
index 714032360..714032360 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kpalmdoc-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kpalmdoc-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kpalmdoc.xpm b/ubuntu/_base/kdepim/debian/icons/kpalmdoc.xpm
index 02521e56f..02521e56f 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kpalmdoc.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kpalmdoc.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kpilot-16.xpm b/ubuntu/_base/kdepim/debian/icons/kpilot-16.xpm
index 25fe904f2..25fe904f2 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kpilot-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kpilot-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/kpilot.xpm b/ubuntu/_base/kdepim/debian/icons/kpilot.xpm
index b4f7a7aa0..b4f7a7aa0 100644
--- a/ubuntu/maverick/kdepim/debian/icons/kpilot.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/kpilot.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/ksync-16.xpm b/ubuntu/_base/kdepim/debian/icons/ksync-16.xpm
index 46518a787..46518a787 100644
--- a/ubuntu/maverick/kdepim/debian/icons/ksync-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/ksync-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/ksync.xpm b/ubuntu/_base/kdepim/debian/icons/ksync.xpm
index cb7727237..cb7727237 100644
--- a/ubuntu/maverick/kdepim/debian/icons/ksync.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/ksync.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/ktnef-16.xpm b/ubuntu/_base/kdepim/debian/icons/ktnef-16.xpm
index a387d347f..a387d347f 100644
--- a/ubuntu/maverick/kdepim/debian/icons/ktnef-16.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/ktnef-16.xpm
diff --git a/ubuntu/maverick/kdepim/debian/icons/ktnef.xpm b/ubuntu/_base/kdepim/debian/icons/ktnef.xpm
index dc0d1a689..dc0d1a689 100644
--- a/ubuntu/maverick/kdepim/debian/icons/ktnef.xpm
+++ b/ubuntu/_base/kdepim/debian/icons/ktnef.xpm
diff --git a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install b/ubuntu/_base/kdepim/debian/kaddressbook-trinity.install
index ce026e81a..ce026e81a 100644
--- a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kaddressbook-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.links b/ubuntu/_base/kdepim/debian/kaddressbook-trinity.links
index 8a98675cc..8a98675cc 100644
--- a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.links
+++ b/ubuntu/_base/kdepim/debian/kaddressbook-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.manpages b/ubuntu/_base/kdepim/debian/kaddressbook-trinity.manpages
index 74ba46e49..74ba46e49 100644
--- a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kaddressbook-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.menu b/ubuntu/_base/kdepim/debian/kaddressbook-trinity.menu
index e8ffd03da..e8ffd03da 100644
--- a/ubuntu/maverick/kdepim/debian/kaddressbook-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/kaddressbook-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/kalarm-trinity.install b/ubuntu/_base/kdepim/debian/kalarm-trinity.install
index a191321ec..a191321ec 100644
--- a/ubuntu/maverick/kdepim/debian/kalarm-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kalarm-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kalarm-trinity.links b/ubuntu/_base/kdepim/debian/kalarm-trinity.links
index 436bd4cca..436bd4cca 100644
--- a/ubuntu/maverick/kdepim/debian/kalarm-trinity.links
+++ b/ubuntu/_base/kdepim/debian/kalarm-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/kalarm-trinity.manpages b/ubuntu/_base/kdepim/debian/kalarm-trinity.manpages
index 5be431fd7..5be431fd7 100644
--- a/ubuntu/maverick/kdepim/debian/kalarm-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kalarm-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kalarm-trinity.menu b/ubuntu/_base/kdepim/debian/kalarm-trinity.menu
index 9042b1f8f..9042b1f8f 100644
--- a/ubuntu/maverick/kdepim/debian/kalarm-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/kalarm-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/kandy-trinity.install b/ubuntu/_base/kdepim/debian/kandy-trinity.install
index d42acd2ce..d42acd2ce 100644
--- a/ubuntu/maverick/kdepim/debian/kandy-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kandy-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kandy-trinity.links b/ubuntu/_base/kdepim/debian/kandy-trinity.links
index f2d49c8a3..f2d49c8a3 100644
--- a/ubuntu/maverick/kdepim/debian/kandy-trinity.links
+++ b/ubuntu/_base/kdepim/debian/kandy-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/kandy-trinity.manpages b/ubuntu/_base/kdepim/debian/kandy-trinity.manpages
index 03554768f..03554768f 100644
--- a/ubuntu/maverick/kdepim/debian/kandy-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kandy-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kandy-trinity.menu b/ubuntu/_base/kdepim/debian/kandy-trinity.menu
index 6166a1cb3..6166a1cb3 100644
--- a/ubuntu/maverick/kdepim/debian/kandy-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/kandy-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/karm-trinity.install b/ubuntu/_base/kdepim/debian/karm-trinity.install
index a2a22b674..a2a22b674 100644
--- a/ubuntu/maverick/kdepim/debian/karm-trinity.install
+++ b/ubuntu/_base/kdepim/debian/karm-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/karm-trinity.links b/ubuntu/_base/kdepim/debian/karm-trinity.links
index 7ea1d2f25..7ea1d2f25 100644
--- a/ubuntu/maverick/kdepim/debian/karm-trinity.links
+++ b/ubuntu/_base/kdepim/debian/karm-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/karm-trinity.manpages b/ubuntu/_base/kdepim/debian/karm-trinity.manpages
index 0ae3f04a8..0ae3f04a8 100644
--- a/ubuntu/maverick/kdepim/debian/karm-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/karm-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/karm-trinity.menu b/ubuntu/_base/kdepim/debian/karm-trinity.menu
index 1d268ea7d..1d268ea7d 100644
--- a/ubuntu/maverick/kdepim/debian/karm-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/karm-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook
index 22de9f47d..22de9f47d 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kaddressbook
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kalarm b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kalarm
index 945098a05..945098a05 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kalarm
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kalarm
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kandy b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kandy
index 9b7856c7c..9b7856c7c 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kandy
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kandy
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.karm b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.karm
index 2df9047b4..2df9047b4 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.karm
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.karm
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kleopatra b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kleopatra
index 4912bdc06..4912bdc06 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kleopatra
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kleopatra
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kmail b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kmail
index 98506502f..98506502f 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kmail
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kmail
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.knode b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.knode
index 230718ab6..230718ab6 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.knode
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.knode
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.knotes b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.knotes
index 9e79a178a..9e79a178a 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.knotes
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.knotes
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
index d5fe22989..d5fe22989 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.konsolekalendar
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kontact b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kontact
index 080a8abce..080a8abce 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kontact
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kontact
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.korganizer b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.korganizer
index 6a9cc6494..6a9cc6494 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.korganizer
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.korganizer
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.korn b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.korn
index 9315f091d..9315f091d 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.korn
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.korn
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kpilot b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kpilot
index 85f7e7f3c..85f7e7f3c 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kpilot
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kpilot
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.ktnef b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.ktnef
index 87c81087d..87c81087d 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.ktnef
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.ktnef
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
index b5e43637f..b5e43637f 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.kwatchgnupg
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.multisynk b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.multisynk
index 5e1dc3a81..5e1dc3a81 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-doc-html.doc-base.multisynk
+++ b/ubuntu/_base/kdepim/debian/kdepim-doc-html.doc-base.multisynk
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install b/ubuntu/_base/kdepim/debian/kdepim-kfile-plugins-trinity.install
index 3f39aaf87..3f39aaf87 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-kfile-plugins-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kdepim-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install b/ubuntu/_base/kdepim/debian/kdepim-kio-plugins-trinity.install
index f9cc8ca27..f9cc8ca27 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-kio-plugins-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kdepim-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install b/ubuntu/_base/kdepim/debian/kdepim-kresources-trinity.install
index 588b690b1..588b690b1 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-kresources-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kdepim-kresources-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-trinity-dev.install b/ubuntu/_base/kdepim/debian/kdepim-trinity-dev.install
index bec38f84a..bec38f84a 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/kdepim-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.doc-base b/ubuntu/_base/kdepim/debian/kdepim-trinity-doc.doc-base
index 847262d64..847262d64 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.doc-base
+++ b/ubuntu/_base/kdepim/debian/kdepim-trinity-doc.doc-base
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install b/ubuntu/_base/kdepim/debian/kdepim-trinity-doc.install
index c89dce2b0..c89dce2b0 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-trinity-doc.install
+++ b/ubuntu/_base/kdepim/debian/kdepim-trinity-doc.install
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install b/ubuntu/_base/kdepim/debian/kdepim-wizards-trinity.install
index 465782c25..465782c25 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kdepim-wizards-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.manpages b/ubuntu/_base/kdepim/debian/kdepim-wizards-trinity.manpages
index 04a5781f5..04a5781f5 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kdepim-wizards-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.menu b/ubuntu/_base/kdepim/debian/kdepim-wizards-trinity.menu
index c622368a5..c622368a5 100644
--- a/ubuntu/maverick/kdepim/debian/kdepim-wizards-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/kdepim-wizards-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install b/ubuntu/_base/kdepim/debian/kitchensync-trinity.install
index cdf89734d..cdf89734d 100644
--- a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kitchensync-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.manpages b/ubuntu/_base/kdepim/debian/kitchensync-trinity.manpages
index f921c8c0e..f921c8c0e 100644
--- a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kitchensync-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.menu b/ubuntu/_base/kdepim/debian/kitchensync-trinity.menu
index 3e47d5786..3e47d5786 100644
--- a/ubuntu/maverick/kdepim/debian/kitchensync-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/kitchensync-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install b/ubuntu/_base/kdepim/debian/kleopatra-trinity.install
index 2e5241ad1..2e5241ad1 100644
--- a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kleopatra-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.links b/ubuntu/_base/kdepim/debian/kleopatra-trinity.links
index 89f636dcd..89f636dcd 100644
--- a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.links
+++ b/ubuntu/_base/kdepim/debian/kleopatra-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.manpages b/ubuntu/_base/kdepim/debian/kleopatra-trinity.manpages
index 37a8fdc2f..37a8fdc2f 100644
--- a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kleopatra-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.menu b/ubuntu/_base/kdepim/debian/kleopatra-trinity.menu
index c243663c9..c243663c9 100644
--- a/ubuntu/maverick/kdepim/debian/kleopatra-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/kleopatra-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/kmail-trinity.install b/ubuntu/_base/kdepim/debian/kmail-trinity.install
index 54df014f9..54df014f9 100644
--- a/ubuntu/maverick/kdepim/debian/kmail-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kmail-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kmail-trinity.links b/ubuntu/_base/kdepim/debian/kmail-trinity.links
index 21e8a877a..21e8a877a 100644
--- a/ubuntu/maverick/kdepim/debian/kmail-trinity.links
+++ b/ubuntu/_base/kdepim/debian/kmail-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/kmail-trinity.manpages b/ubuntu/_base/kdepim/debian/kmail-trinity.manpages
index 5a5b3a51e..5a5b3a51e 100644
--- a/ubuntu/maverick/kdepim/debian/kmail-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kmail-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kmail-trinity.menu b/ubuntu/_base/kdepim/debian/kmail-trinity.menu
index 186aa91b5..186aa91b5 100644
--- a/ubuntu/maverick/kdepim/debian/kmail-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/kmail-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/kmail.NEWS b/ubuntu/_base/kdepim/debian/kmail.NEWS
index af3b48cf6..af3b48cf6 100644
--- a/ubuntu/maverick/kdepim/debian/kmail.NEWS
+++ b/ubuntu/_base/kdepim/debian/kmail.NEWS
diff --git a/ubuntu/maverick/kdepim/debian/kmail.README.Debian b/ubuntu/_base/kdepim/debian/kmail.README.Debian
index 9737546e2..9737546e2 100644
--- a/ubuntu/maverick/kdepim/debian/kmail.README.Debian
+++ b/ubuntu/_base/kdepim/debian/kmail.README.Debian
diff --git a/ubuntu/maverick/kdepim/debian/kmailcvt-trinity.install b/ubuntu/_base/kdepim/debian/kmailcvt-trinity.install
index 967e8fd24..967e8fd24 100644
--- a/ubuntu/maverick/kdepim/debian/kmailcvt-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kmailcvt-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kmailcvt-trinity.manpages b/ubuntu/_base/kdepim/debian/kmailcvt-trinity.manpages
index 4eb8c2067..4eb8c2067 100644
--- a/ubuntu/maverick/kdepim/debian/kmailcvt-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kmailcvt-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kmailcvt-trinity.menu b/ubuntu/_base/kdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..1fdaa32b6 100644
--- a/ubuntu/maverick/kdepim/debian/kmailcvt-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/kmailcvt-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/knode-trinity.install b/ubuntu/_base/kdepim/debian/knode-trinity.install
index 964e43e76..964e43e76 100644
--- a/ubuntu/maverick/kdepim/debian/knode-trinity.install
+++ b/ubuntu/_base/kdepim/debian/knode-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/knode-trinity.links b/ubuntu/_base/kdepim/debian/knode-trinity.links
index 61dd05e51..61dd05e51 100644
--- a/ubuntu/maverick/kdepim/debian/knode-trinity.links
+++ b/ubuntu/_base/kdepim/debian/knode-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/knode-trinity.manpages b/ubuntu/_base/kdepim/debian/knode-trinity.manpages
index 72c9b5b9b..72c9b5b9b 100644
--- a/ubuntu/maverick/kdepim/debian/knode-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/knode-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/knode-trinity.menu b/ubuntu/_base/kdepim/debian/knode-trinity.menu
index 97a22d6ab..97a22d6ab 100644
--- a/ubuntu/maverick/kdepim/debian/knode-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/knode-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/knotes-trinity.install b/ubuntu/_base/kdepim/debian/knotes-trinity.install
index 602954d5d..602954d5d 100644
--- a/ubuntu/maverick/kdepim/debian/knotes-trinity.install
+++ b/ubuntu/_base/kdepim/debian/knotes-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/knotes-trinity.links b/ubuntu/_base/kdepim/debian/knotes-trinity.links
index 1ba2fa093..1ba2fa093 100644
--- a/ubuntu/maverick/kdepim/debian/knotes-trinity.links
+++ b/ubuntu/_base/kdepim/debian/knotes-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/knotes-trinity.manpages b/ubuntu/_base/kdepim/debian/knotes-trinity.manpages
index ef942a499..ef942a499 100644
--- a/ubuntu/maverick/kdepim/debian/knotes-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/knotes-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/knotes-trinity.menu b/ubuntu/_base/kdepim/debian/knotes-trinity.menu
index ed71f1012..ed71f1012 100644
--- a/ubuntu/maverick/kdepim/debian/knotes-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/knotes-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/knotes-trinity.preinst b/ubuntu/_base/kdepim/debian/knotes-trinity.preinst
index a56aa3945..a56aa3945 100644
--- a/ubuntu/maverick/kdepim/debian/knotes-trinity.preinst
+++ b/ubuntu/_base/kdepim/debian/knotes-trinity.preinst
diff --git a/ubuntu/maverick/kdepim/debian/kode-trinity.install b/ubuntu/_base/kdepim/debian/kode-trinity.install
index 2097cf80b..2097cf80b 100644
--- a/ubuntu/maverick/kdepim/debian/kode-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kode-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kode-trinity.manpages b/ubuntu/_base/kdepim/debian/kode-trinity.manpages
index 0c947e5fb..0c947e5fb 100644
--- a/ubuntu/maverick/kdepim/debian/kode-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kode-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/konsolekalendar-trinity.install b/ubuntu/_base/kdepim/debian/konsolekalendar-trinity.install
index 5f5765429..5f5765429 100644
--- a/ubuntu/maverick/kdepim/debian/konsolekalendar-trinity.install
+++ b/ubuntu/_base/kdepim/debian/konsolekalendar-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/konsolekalendar-trinity.links b/ubuntu/_base/kdepim/debian/konsolekalendar-trinity.links
index 423b5c172..423b5c172 100644
--- a/ubuntu/maverick/kdepim/debian/konsolekalendar-trinity.links
+++ b/ubuntu/_base/kdepim/debian/konsolekalendar-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/konsolekalendar-trinity.manpages b/ubuntu/_base/kdepim/debian/konsolekalendar-trinity.manpages
index 8af64605b..8af64605b 100644
--- a/ubuntu/maverick/kdepim/debian/konsolekalendar-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/konsolekalendar-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kontact-trinity.install b/ubuntu/_base/kdepim/debian/kontact-trinity.install
index 4c0bc653b..4c0bc653b 100644
--- a/ubuntu/maverick/kdepim/debian/kontact-trinity.install
+++ b/ubuntu/_base/kdepim/debian/kontact-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/kontact-trinity.links b/ubuntu/_base/kdepim/debian/kontact-trinity.links
index 9f0e2beff..9f0e2beff 100644
--- a/ubuntu/maverick/kdepim/debian/kontact-trinity.links
+++ b/ubuntu/_base/kdepim/debian/kontact-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/kontact-trinity.manpages b/ubuntu/_base/kdepim/debian/kontact-trinity.manpages
index a2900a879..a2900a879 100644
--- a/ubuntu/maverick/kdepim/debian/kontact-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/kontact-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/kontact-trinity.menu b/ubuntu/_base/kdepim/debian/kontact-trinity.menu
index 04ef20207..04ef20207 100644
--- a/ubuntu/maverick/kdepim/debian/kontact-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/kontact-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/korganizer-trinity.install b/ubuntu/_base/kdepim/debian/korganizer-trinity.install
index f5b60b56b..f5b60b56b 100644
--- a/ubuntu/maverick/kdepim/debian/korganizer-trinity.install
+++ b/ubuntu/_base/kdepim/debian/korganizer-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/korganizer-trinity.links b/ubuntu/_base/kdepim/debian/korganizer-trinity.links
index 608fc7441..608fc7441 100644
--- a/ubuntu/maverick/kdepim/debian/korganizer-trinity.links
+++ b/ubuntu/_base/kdepim/debian/korganizer-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/korganizer-trinity.manpages b/ubuntu/_base/kdepim/debian/korganizer-trinity.manpages
index 64d6e1199..64d6e1199 100644
--- a/ubuntu/maverick/kdepim/debian/korganizer-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/korganizer-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/korganizer-trinity.menu b/ubuntu/_base/kdepim/debian/korganizer-trinity.menu
index d5d1f0aaf..d5d1f0aaf 100644
--- a/ubuntu/maverick/kdepim/debian/korganizer-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/korganizer-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/korn-trinity.install b/ubuntu/_base/kdepim/debian/korn-trinity.install
index 5b1c7fdaf..5b1c7fdaf 100644
--- a/ubuntu/maverick/kdepim/debian/korn-trinity.install
+++ b/ubuntu/_base/kdepim/debian/korn-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/korn-trinity.links b/ubuntu/_base/kdepim/debian/korn-trinity.links
index 915338e25..915338e25 100644
--- a/ubuntu/maverick/kdepim/debian/korn-trinity.links
+++ b/ubuntu/_base/kdepim/debian/korn-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/korn-trinity.manpages b/ubuntu/_base/kdepim/debian/korn-trinity.manpages
index 7a67836ba..7a67836ba 100644
--- a/ubuntu/maverick/kdepim/debian/korn-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/korn-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/korn-trinity.menu b/ubuntu/_base/kdepim/debian/korn-trinity.menu
index 8187a30d3..8187a30d3 100644
--- a/ubuntu/maverick/kdepim/debian/korn-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/korn-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/ktnef-trinity.install b/ubuntu/_base/kdepim/debian/ktnef-trinity.install
index 1f299a543..1f299a543 100644
--- a/ubuntu/maverick/kdepim/debian/ktnef-trinity.install
+++ b/ubuntu/_base/kdepim/debian/ktnef-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/ktnef-trinity.links b/ubuntu/_base/kdepim/debian/ktnef-trinity.links
index c93eb29f5..c93eb29f5 100644
--- a/ubuntu/maverick/kdepim/debian/ktnef-trinity.links
+++ b/ubuntu/_base/kdepim/debian/ktnef-trinity.links
diff --git a/ubuntu/maverick/kdepim/debian/ktnef-trinity.manpages b/ubuntu/_base/kdepim/debian/ktnef-trinity.manpages
index 7a8886ac6..7a8886ac6 100644
--- a/ubuntu/maverick/kdepim/debian/ktnef-trinity.manpages
+++ b/ubuntu/_base/kdepim/debian/ktnef-trinity.manpages
diff --git a/ubuntu/maverick/kdepim/debian/ktnef-trinity.menu b/ubuntu/_base/kdepim/debian/ktnef-trinity.menu
index df93e1181..df93e1181 100644
--- a/ubuntu/maverick/kdepim/debian/ktnef-trinity.menu
+++ b/ubuntu/_base/kdepim/debian/ktnef-trinity.menu
diff --git a/ubuntu/maverick/kdepim/debian/ktnef-trinity.mime b/ubuntu/_base/kdepim/debian/ktnef-trinity.mime
index 35a952194..35a952194 100644
--- a/ubuntu/maverick/kdepim/debian/ktnef-trinity.mime
+++ b/ubuntu/_base/kdepim/debian/ktnef-trinity.mime
diff --git a/ubuntu/maverick/kdepim/debian/libindex0-trinity-dev.docs b/ubuntu/_base/kdepim/debian/libindex0-trinity-dev.docs
index aa30f8b2c..aa30f8b2c 100644
--- a/ubuntu/maverick/kdepim/debian/libindex0-trinity-dev.docs
+++ b/ubuntu/_base/kdepim/debian/libindex0-trinity-dev.docs
diff --git a/ubuntu/maverick/kdepim/debian/libindex0-trinity-dev.install b/ubuntu/_base/kdepim/debian/libindex0-trinity-dev.install
index 6e84a12b1..6e84a12b1 100644
--- a/ubuntu/maverick/kdepim/debian/libindex0-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/libindex0-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/libindex0-trinity.install b/ubuntu/_base/kdepim/debian/libindex0-trinity.install
index 2a278e4fe..2a278e4fe 100644
--- a/ubuntu/maverick/kdepim/debian/libindex0-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libindex0-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libkcal2-trinity-dev.install b/ubuntu/_base/kdepim/debian/libkcal2-trinity-dev.install
index a36a88caa..a36a88caa 100644
--- a/ubuntu/maverick/kdepim/debian/libkcal2-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/libkcal2-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install b/ubuntu/_base/kdepim/debian/libkcal2b-trinity.install
index ca6e71652..ca6e71652 100644
--- a/ubuntu/maverick/kdepim/debian/libkcal2b-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libkcal2b-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libkdepim1-trinity-dev.install b/ubuntu/_base/kdepim/debian/libkdepim1-trinity-dev.install
index 236131ea6..236131ea6 100644
--- a/ubuntu/maverick/kdepim/debian/libkdepim1-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/libkdepim1-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install b/ubuntu/_base/kdepim/debian/libkdepim1a-trinity.install
index b7799470a..b7799470a 100644
--- a/ubuntu/maverick/kdepim/debian/libkdepim1a-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libkdepim1a-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libkgantt0-trinity-dev.install b/ubuntu/_base/kdepim/debian/libkgantt0-trinity-dev.install
index e042469fa..e042469fa 100644
--- a/ubuntu/maverick/kdepim/debian/libkgantt0-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/libkgantt0-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/libkgantt0-trinity.install b/ubuntu/_base/kdepim/debian/libkgantt0-trinity.install
index d3cf0216a..d3cf0216a 100644
--- a/ubuntu/maverick/kdepim/debian/libkgantt0-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libkgantt0-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libkleopatra1-trinity-dev.install b/ubuntu/_base/kdepim/debian/libkleopatra1-trinity-dev.install
index 6ac5db793..6ac5db793 100644
--- a/ubuntu/maverick/kdepim/debian/libkleopatra1-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/libkleopatra1-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/libkleopatra1-trinity.install b/ubuntu/_base/kdepim/debian/libkleopatra1-trinity.install
index 88ef2ab95..88ef2ab95 100644
--- a/ubuntu/maverick/kdepim/debian/libkleopatra1-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libkleopatra1-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libkmime2-trinity.install b/ubuntu/_base/kdepim/debian/libkmime2-trinity.install
index ef3533fbe..ef3533fbe 100644
--- a/ubuntu/maverick/kdepim/debian/libkmime2-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libkmime2-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity-dev.install b/ubuntu/_base/kdepim/debian/libkpimexchange1-trinity-dev.install
index 88536e532..88536e532 100644
--- a/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/libkpimexchange1-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install b/ubuntu/_base/kdepim/debian/libkpimexchange1-trinity.install
index f5b098575..f5b098575 100644
--- a/ubuntu/maverick/kdepim/debian/libkpimexchange1-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libkpimexchange1-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libkpimidentities1-trinity.install b/ubuntu/_base/kdepim/debian/libkpimidentities1-trinity.install
index 156f7036c..156f7036c 100644
--- a/ubuntu/maverick/kdepim/debian/libkpimidentities1-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libkpimidentities1-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libksieve0-trinity-dev.install b/ubuntu/_base/kdepim/debian/libksieve0-trinity-dev.install
index 2f74cc12f..2f74cc12f 100644
--- a/ubuntu/maverick/kdepim/debian/libksieve0-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/libksieve0-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/libksieve0-trinity.install b/ubuntu/_base/kdepim/debian/libksieve0-trinity.install
index 3e139e6b2..3e139e6b2 100644
--- a/ubuntu/maverick/kdepim/debian/libksieve0-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libksieve0-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libktnef1-trinity-dev.install b/ubuntu/_base/kdepim/debian/libktnef1-trinity-dev.install
index 03b67df5b..03b67df5b 100644
--- a/ubuntu/maverick/kdepim/debian/libktnef1-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/libktnef1-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/libktnef1-trinity.install b/ubuntu/_base/kdepim/debian/libktnef1-trinity.install
index b956b9b12..b956b9b12 100644
--- a/ubuntu/maverick/kdepim/debian/libktnef1-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libktnef1-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/libmimelib1-trinity-dev.install b/ubuntu/_base/kdepim/debian/libmimelib1-trinity-dev.install
index d843ad5b8..d843ad5b8 100644
--- a/ubuntu/maverick/kdepim/debian/libmimelib1-trinity-dev.install
+++ b/ubuntu/_base/kdepim/debian/libmimelib1-trinity-dev.install
diff --git a/ubuntu/maverick/kdepim/debian/libmimelib1c2a-trinity.install b/ubuntu/_base/kdepim/debian/libmimelib1c2a-trinity.install
index 3d4feb108..3d4feb108 100644
--- a/ubuntu/maverick/kdepim/debian/libmimelib1c2a-trinity.install
+++ b/ubuntu/_base/kdepim/debian/libmimelib1c2a-trinity.install
diff --git a/ubuntu/maverick/kdepim/debian/man/akregator-trinity.man b/ubuntu/_base/kdepim/debian/man/akregator-trinity.man
index 5913cc461..5913cc461 100644
--- a/ubuntu/maverick/kdepim/debian/man/akregator-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/akregator-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/egroupwarewizard-trinity.man b/ubuntu/_base/kdepim/debian/man/egroupwarewizard-trinity.man
index 2ba3d8f79..2ba3d8f79 100644
--- a/ubuntu/maverick/kdepim/debian/man/egroupwarewizard-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/egroupwarewizard-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/exchangewizard-trinity.man b/ubuntu/_base/kdepim/debian/man/exchangewizard-trinity.man
index 87357e872..87357e872 100644
--- a/ubuntu/maverick/kdepim/debian/man/exchangewizard-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/exchangewizard-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/groupwarewizard-trinity.man b/ubuntu/_base/kdepim/debian/man/groupwarewizard-trinity.man
index 9e6adf77b..9e6adf77b 100644
--- a/ubuntu/maverick/kdepim/debian/man/groupwarewizard-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/groupwarewizard-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/groupwisewizard-trinity.man b/ubuntu/_base/kdepim/debian/man/groupwisewizard-trinity.man
index 947ea86e2..947ea86e2 100644
--- a/ubuntu/maverick/kdepim/debian/man/groupwisewizard-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/groupwisewizard-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/ical2vcal-trinity.man b/ubuntu/_base/kdepim/debian/man/ical2vcal-trinity.man
index d6adbaa01..d6adbaa01 100644
--- a/ubuntu/maverick/kdepim/debian/man/ical2vcal-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/ical2vcal-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kabc2mutt-trinity.man b/ubuntu/_base/kdepim/debian/man/kabc2mutt-trinity.man
index b62278dc6..b62278dc6 100644
--- a/ubuntu/maverick/kdepim/debian/man/kabc2mutt-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kabc2mutt-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kaddressbook-trinity.man b/ubuntu/_base/kdepim/debian/man/kaddressbook-trinity.man
index 04d47b403..04d47b403 100644
--- a/ubuntu/maverick/kdepim/debian/man/kaddressbook-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kaddressbook-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kalarm-trinity.man b/ubuntu/_base/kdepim/debian/man/kalarm-trinity.man
index 71322519b..71322519b 100644
--- a/ubuntu/maverick/kdepim/debian/man/kalarm-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kalarm-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kalarmd-trinity.man b/ubuntu/_base/kdepim/debian/man/kalarmd-trinity.man
index 4c639b377..4c639b377 100644
--- a/ubuntu/maverick/kdepim/debian/man/kalarmd-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kalarmd-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kandy-trinity.man b/ubuntu/_base/kdepim/debian/man/kandy-trinity.man
index bcef93b4d..bcef93b4d 100644
--- a/ubuntu/maverick/kdepim/debian/man/kandy-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kandy-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kandy_client-trinity.man b/ubuntu/_base/kdepim/debian/man/kandy_client-trinity.man
index 394366e0a..394366e0a 100644
--- a/ubuntu/maverick/kdepim/debian/man/kandy_client-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kandy_client-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/karm-trinity.man b/ubuntu/_base/kdepim/debian/man/karm-trinity.man
index f187d051f..f187d051f 100644
--- a/ubuntu/maverick/kdepim/debian/man/karm-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/karm-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kdeopt.part b/ubuntu/_base/kdepim/debian/man/kdeopt.part
index d258f0ad1..d258f0ad1 100644
--- a/ubuntu/maverick/kdepim/debian/man/kdeopt.part
+++ b/ubuntu/_base/kdepim/debian/man/kdeopt.part
diff --git a/ubuntu/maverick/kdepim/debian/man/kitchensync-trinity.man b/ubuntu/_base/kdepim/debian/man/kitchensync-trinity.man
index cd970e90b..cd970e90b 100644
--- a/ubuntu/maverick/kdepim/debian/man/kitchensync-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kitchensync-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kleopatra-trinity.man b/ubuntu/_base/kdepim/debian/man/kleopatra-trinity.man
index ea7a7487d..ea7a7487d 100644
--- a/ubuntu/maverick/kdepim/debian/man/kleopatra-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kleopatra-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kmail-trinity.man b/ubuntu/_base/kdepim/debian/man/kmail-trinity.man
index 948462a5f..948462a5f 100644
--- a/ubuntu/maverick/kdepim/debian/man/kmail-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kmail-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kmail_antivir.sh-trinity.man b/ubuntu/_base/kdepim/debian/man/kmail_antivir.sh-trinity.man
index 53b347173..53b347173 100644
--- a/ubuntu/maverick/kdepim/debian/man/kmail_antivir.sh-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kmail_antivir.sh-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kmail_clamav.sh-trinity.man b/ubuntu/_base/kdepim/debian/man/kmail_clamav.sh-trinity.man
index 90cd51899..90cd51899 100644
--- a/ubuntu/maverick/kdepim/debian/man/kmail_clamav.sh-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kmail_clamav.sh-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kmail_fprot.sh-trinity.man b/ubuntu/_base/kdepim/debian/man/kmail_fprot.sh-trinity.man
index e44a2ee6a..e44a2ee6a 100644
--- a/ubuntu/maverick/kdepim/debian/man/kmail_fprot.sh-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kmail_fprot.sh-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kmail_sav.sh-trinity.man b/ubuntu/_base/kdepim/debian/man/kmail_sav.sh-trinity.man
index 64eb01ab6..64eb01ab6 100644
--- a/ubuntu/maverick/kdepim/debian/man/kmail_sav.sh-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kmail_sav.sh-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kmailcvt-trinity.man b/ubuntu/_base/kdepim/debian/man/kmailcvt-trinity.man
index f76bf7e7a..f76bf7e7a 100644
--- a/ubuntu/maverick/kdepim/debian/man/kmailcvt-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kmailcvt-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/knode-trinity.man b/ubuntu/_base/kdepim/debian/man/knode-trinity.man
index b237490c9..b237490c9 100644
--- a/ubuntu/maverick/kdepim/debian/man/knode-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/knode-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/knotes-trinity.man b/ubuntu/_base/kdepim/debian/man/knotes-trinity.man
index 77380be9a..77380be9a 100644
--- a/ubuntu/maverick/kdepim/debian/man/knotes-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/knotes-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kode-trinity.man b/ubuntu/_base/kdepim/debian/man/kode-trinity.man
index 183fc77b5..183fc77b5 100644
--- a/ubuntu/maverick/kdepim/debian/man/kode-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kode-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kolabwizard-trinity.man b/ubuntu/_base/kdepim/debian/man/kolabwizard-trinity.man
index 1329458ee..1329458ee 100644
--- a/ubuntu/maverick/kdepim/debian/man/kolabwizard-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kolabwizard-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/konsolekalendar-trinity.man b/ubuntu/_base/kdepim/debian/man/konsolekalendar-trinity.man
index 7d8f7efab..7d8f7efab 100644
--- a/ubuntu/maverick/kdepim/debian/man/konsolekalendar-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/konsolekalendar-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kontact-trinity.man b/ubuntu/_base/kdepim/debian/man/kontact-trinity.man
index 3f712f1e6..3f712f1e6 100644
--- a/ubuntu/maverick/kdepim/debian/man/kontact-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kontact-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/korgac-trinity.man b/ubuntu/_base/kdepim/debian/man/korgac-trinity.man
index ced615aeb..ced615aeb 100644
--- a/ubuntu/maverick/kdepim/debian/man/korgac-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/korgac-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/korganizer-trinity.man b/ubuntu/_base/kdepim/debian/man/korganizer-trinity.man
index e11c28620..e11c28620 100644
--- a/ubuntu/maverick/kdepim/debian/man/korganizer-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/korganizer-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/korn-trinity.man b/ubuntu/_base/kdepim/debian/man/korn-trinity.man
index 44e62c1a0..44e62c1a0 100644
--- a/ubuntu/maverick/kdepim/debian/man/korn-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/korn-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kpalmdoc-trinity.man b/ubuntu/_base/kdepim/debian/man/kpalmdoc-trinity.man
index 3bbfc16ea..3bbfc16ea 100644
--- a/ubuntu/maverick/kdepim/debian/man/kpalmdoc-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kpalmdoc-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kpilot-trinity.man b/ubuntu/_base/kdepim/debian/man/kpilot-trinity.man
index 923de2776..923de2776 100644
--- a/ubuntu/maverick/kdepim/debian/man/kpilot-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kpilot-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kpilotDaemon-trinity.man b/ubuntu/_base/kdepim/debian/man/kpilotDaemon-trinity.man
index c58a2065d..c58a2065d 100644
--- a/ubuntu/maverick/kdepim/debian/man/kpilotDaemon-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kpilotDaemon-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/ksync-trinity.man b/ubuntu/_base/kdepim/debian/man/ksync-trinity.man
index c62365b1f..c62365b1f 100644
--- a/ubuntu/maverick/kdepim/debian/man/ksync-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/ksync-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/ktnef-trinity.man b/ubuntu/_base/kdepim/debian/man/ktnef-trinity.man
index 8c1402996..8c1402996 100644
--- a/ubuntu/maverick/kdepim/debian/man/ktnef-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/ktnef-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kwatchgnupg-trinity.man b/ubuntu/_base/kdepim/debian/man/kwatchgnupg-trinity.man
index fe9504b3b..fe9504b3b 100644
--- a/ubuntu/maverick/kdepim/debian/man/kwatchgnupg-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kwatchgnupg-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/kxml_compiler-trinity.man b/ubuntu/_base/kdepim/debian/man/kxml_compiler-trinity.man
index 90d7a0ea9..90d7a0ea9 100644
--- a/ubuntu/maverick/kdepim/debian/man/kxml_compiler-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/kxml_compiler-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/multisynk-trinity.man b/ubuntu/_base/kdepim/debian/man/multisynk-trinity.man
index ffcfa5fba..ffcfa5fba 100644
--- a/ubuntu/maverick/kdepim/debian/man/multisynk-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/multisynk-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/networkstatustestservice-trinity.man b/ubuntu/_base/kdepim/debian/man/networkstatustestservice-trinity.man
index 2d2f4a1be..2d2f4a1be 100644
--- a/ubuntu/maverick/kdepim/debian/man/networkstatustestservice-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/networkstatustestservice-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/man/sloxwizard-trinity.man b/ubuntu/_base/kdepim/debian/man/sloxwizard-trinity.man
index 18235ce81..18235ce81 100644
--- a/ubuntu/maverick/kdepim/debian/man/sloxwizard-trinity.man
+++ b/ubuntu/_base/kdepim/debian/man/sloxwizard-trinity.man
diff --git a/ubuntu/maverick/kdepim/debian/patches/series b/ubuntu/_base/kdepim/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdepim/debian/patches/series
+++ b/ubuntu/_base/kdepim/debian/patches/series
diff --git a/ubuntu/maverick/kdepim/debian/rules b/ubuntu/_base/kdepim/debian/rules
index 23a00eba7..23a00eba7 100755
--- a/ubuntu/maverick/kdepim/debian/rules
+++ b/ubuntu/_base/kdepim/debian/rules
diff --git a/ubuntu/maverick/kdepim/debian/shlibs.local b/ubuntu/_base/kdepim/debian/shlibs.local
index 85fbde26a..85fbde26a 100644
--- a/ubuntu/maverick/kdepim/debian/shlibs.local
+++ b/ubuntu/_base/kdepim/debian/shlibs.local
diff --git a/ubuntu/maverick/kdepim/debian/source/format b/ubuntu/_base/kdepim/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdepim/debian/source/format
+++ b/ubuntu/_base/kdepim/debian/source/format
diff --git a/ubuntu/maverick/kdepim/debian/source/options b/ubuntu/_base/kdepim/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdepim/debian/source/options
+++ b/ubuntu/_base/kdepim/debian/source/options
diff --git a/ubuntu/maverick/kdesdk/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/_base/kdesdk/debian/KUBUNTU-DEBIAN-CHANGES
index d73d1b6ae..d73d1b6ae 100644
--- a/ubuntu/maverick/kdesdk/debian/KUBUNTU-DEBIAN-CHANGES
+++ b/ubuntu/_base/kdesdk/debian/KUBUNTU-DEBIAN-CHANGES
diff --git a/ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdesdk/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/ubuntu/maverick/kdesdk/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdesdk/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdesdk/debian/cdbs/kde.mk b/ubuntu/_base/kdesdk/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/kdesdk/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdesdk/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdesdk/debian/cdbs/versions.pl b/ubuntu/_base/kdesdk/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdesdk/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdesdk/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.README.Debian b/ubuntu/_base/kdesdk/debian/cervisia-trinity.README.Debian
index d9a31b41e..d9a31b41e 100644
--- a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.README.Debian
+++ b/ubuntu/_base/kdesdk/debian/cervisia-trinity.README.Debian
diff --git a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.docs b/ubuntu/_base/kdesdk/debian/cervisia-trinity.docs
index 657c4b5eb..657c4b5eb 100644
--- a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/cervisia-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.install b/ubuntu/_base/kdesdk/debian/cervisia-trinity.install
index d24c82f3b..d24c82f3b 100644
--- a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/cervisia-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.lintian b/ubuntu/_base/kdesdk/debian/cervisia-trinity.lintian
index 0037f433c..0037f433c 100644
--- a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/_base/kdesdk/debian/cervisia-trinity.lintian
diff --git a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.menu b/ubuntu/_base/kdesdk/debian/cervisia-trinity.menu
index e2cbd329c..e2cbd329c 100644
--- a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.menu
+++ b/ubuntu/_base/kdesdk/debian/cervisia-trinity.menu
diff --git a/ubuntu/maverick/kdesdk/debian/changelog b/ubuntu/_base/kdesdk/debian/changelog
index a2272cf72..a2272cf72 100644
--- a/ubuntu/maverick/kdesdk/debian/changelog
+++ b/ubuntu/_base/kdesdk/debian/changelog
diff --git a/ubuntu/maverick/kdesdk/debian/compat b/ubuntu/_base/kdesdk/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdesdk/debian/compat
+++ b/ubuntu/_base/kdesdk/debian/compat
diff --git a/ubuntu/maverick/kdesdk/debian/control b/ubuntu/_base/kdesdk/debian/control
index 4009a513c..4009a513c 100644
--- a/ubuntu/maverick/kdesdk/debian/control
+++ b/ubuntu/_base/kdesdk/debian/control
diff --git a/ubuntu/maverick/kdesdk/debian/copyright b/ubuntu/_base/kdesdk/debian/copyright
index 57c7c1593..57c7c1593 100644
--- a/ubuntu/maverick/kdesdk/debian/copyright
+++ b/ubuntu/_base/kdesdk/debian/copyright
diff --git a/ubuntu/maverick/kdesdk/debian/desktop-i18n/createdesktop.pl b/ubuntu/_base/kdesdk/debian/desktop-i18n/createdesktop.pl
index 1705e7d4f..1705e7d4f 100644
--- a/ubuntu/maverick/kdesdk/debian/desktop-i18n/createdesktop.pl
+++ b/ubuntu/_base/kdesdk/debian/desktop-i18n/createdesktop.pl
diff --git a/ubuntu/maverick/kdesdk/debian/desktop-i18n/findfiles b/ubuntu/_base/kdesdk/debian/desktop-i18n/findfiles
index 397948556..397948556 100644
--- a/ubuntu/maverick/kdesdk/debian/desktop-i18n/findfiles
+++ b/ubuntu/_base/kdesdk/debian/desktop-i18n/findfiles
diff --git a/ubuntu/maverick/kdesdk/debian/desktop-i18n/msgsplit b/ubuntu/_base/kdesdk/debian/desktop-i18n/msgsplit
index 98789a47f..98789a47f 100644
--- a/ubuntu/maverick/kdesdk/debian/desktop-i18n/msgsplit
+++ b/ubuntu/_base/kdesdk/debian/desktop-i18n/msgsplit
diff --git a/ubuntu/maverick/kdesdk/debian/icons/catalogmanager.xpm b/ubuntu/_base/kdesdk/debian/icons/catalogmanager.xpm
index 7e508d5f3..7e508d5f3 100644
--- a/ubuntu/maverick/kdesdk/debian/icons/catalogmanager.xpm
+++ b/ubuntu/_base/kdesdk/debian/icons/catalogmanager.xpm
diff --git a/ubuntu/maverick/kdesdk/debian/icons/cervisia.xpm b/ubuntu/_base/kdesdk/debian/icons/cervisia.xpm
index 9a2181402..9a2181402 100644
--- a/ubuntu/maverick/kdesdk/debian/icons/cervisia.xpm
+++ b/ubuntu/_base/kdesdk/debian/icons/cervisia.xpm
diff --git a/ubuntu/maverick/kdesdk/debian/icons/kbabel.xpm b/ubuntu/_base/kdesdk/debian/icons/kbabel.xpm
index e4798b899..e4798b899 100644
--- a/ubuntu/maverick/kdesdk/debian/icons/kbabel.xpm
+++ b/ubuntu/_base/kdesdk/debian/icons/kbabel.xpm
diff --git a/ubuntu/maverick/kdesdk/debian/icons/kbabeldict.xpm b/ubuntu/_base/kdesdk/debian/icons/kbabeldict.xpm
index c560a7381..c560a7381 100644
--- a/ubuntu/maverick/kdesdk/debian/icons/kbabeldict.xpm
+++ b/ubuntu/_base/kdesdk/debian/icons/kbabeldict.xpm
diff --git a/ubuntu/maverick/kdesdk/debian/icons/kbugbuster.xpm b/ubuntu/_base/kdesdk/debian/icons/kbugbuster.xpm
index 67e8cadca..67e8cadca 100644
--- a/ubuntu/maverick/kdesdk/debian/icons/kbugbuster.xpm
+++ b/ubuntu/_base/kdesdk/debian/icons/kbugbuster.xpm
diff --git a/ubuntu/maverick/kdesdk/debian/icons/kcachegrind.xpm b/ubuntu/_base/kdesdk/debian/icons/kcachegrind.xpm
index 843263759..843263759 100644
--- a/ubuntu/maverick/kdesdk/debian/icons/kcachegrind.xpm
+++ b/ubuntu/_base/kdesdk/debian/icons/kcachegrind.xpm
diff --git a/ubuntu/maverick/kdesdk/debian/icons/kompare.xpm b/ubuntu/_base/kdesdk/debian/icons/kompare.xpm
index dd0cb8995..dd0cb8995 100644
--- a/ubuntu/maverick/kdesdk/debian/icons/kompare.xpm
+++ b/ubuntu/_base/kdesdk/debian/icons/kompare.xpm
diff --git a/ubuntu/maverick/kdesdk/debian/icons/kuiviewer.xpm b/ubuntu/_base/kdesdk/debian/icons/kuiviewer.xpm
index 398bd6d37..398bd6d37 100644
--- a/ubuntu/maverick/kdesdk/debian/icons/kuiviewer.xpm
+++ b/ubuntu/_base/kdesdk/debian/icons/kuiviewer.xpm
diff --git a/ubuntu/maverick/kdesdk/debian/icons/umbrello.xpm b/ubuntu/_base/kdesdk/debian/icons/umbrello.xpm
index c8ffc2a80..c8ffc2a80 100644
--- a/ubuntu/maverick/kdesdk/debian/icons/umbrello.xpm
+++ b/ubuntu/_base/kdesdk/debian/icons/umbrello.xpm
diff --git a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.docs b/ubuntu/_base/kdesdk/debian/kapptemplate-trinity.docs
index ae1eeaf96..ae1eeaf96 100644
--- a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kapptemplate-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.install b/ubuntu/_base/kdesdk/debian/kapptemplate-trinity.install
index a10e6654c..a10e6654c 100644
--- a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kapptemplate-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.lintian b/ubuntu/_base/kdesdk/debian/kapptemplate-trinity.lintian
index 803257d10..803257d10 100644
--- a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.lintian
+++ b/ubuntu/_base/kdesdk/debian/kapptemplate-trinity.lintian
diff --git a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.manpages b/ubuntu/_base/kdesdk/debian/kapptemplate-trinity.manpages
index e558b802c..e558b802c 100644
--- a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kapptemplate-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity-dev.docs b/ubuntu/_base/kdesdk/debian/kbabel-trinity-dev.docs
index 372b1530b..372b1530b 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity-dev.docs
+++ b/ubuntu/_base/kdesdk/debian/kbabel-trinity-dev.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity-dev.install b/ubuntu/_base/kdesdk/debian/kbabel-trinity-dev.install
index 4c2720936..4c2720936 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity-dev.install
+++ b/ubuntu/_base/kdesdk/debian/kbabel-trinity-dev.install
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.README.Debian b/ubuntu/_base/kdesdk/debian/kbabel-trinity.README.Debian
index f4eb38546..f4eb38546 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.README.Debian
+++ b/ubuntu/_base/kdesdk/debian/kbabel-trinity.README.Debian
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.docs b/ubuntu/_base/kdesdk/debian/kbabel-trinity.docs
index 372b1530b..372b1530b 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kbabel-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install b/ubuntu/_base/kdesdk/debian/kbabel-trinity.install
index a1b2c2cab..a1b2c2cab 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kbabel-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.lintian b/ubuntu/_base/kdesdk/debian/kbabel-trinity.lintian
index d2f345fca..d2f345fca 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.lintian
+++ b/ubuntu/_base/kdesdk/debian/kbabel-trinity.lintian
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.manpages b/ubuntu/_base/kdesdk/debian/kbabel-trinity.manpages
index e85be5938..e85be5938 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kbabel-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.menu b/ubuntu/_base/kdesdk/debian/kbabel-trinity.menu
index 62d116d5c..62d116d5c 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.menu
+++ b/ubuntu/_base/kdesdk/debian/kbabel-trinity.menu
diff --git a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.mime b/ubuntu/_base/kdesdk/debian/kbabel-trinity.mime
index b6e1fe021..b6e1fe021 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.mime
+++ b/ubuntu/_base/kdesdk/debian/kbabel-trinity.mime
diff --git a/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.docs b/ubuntu/_base/kdesdk/debian/kbugbuster-trinity.docs
index 94789b715..94789b715 100644
--- a/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kbugbuster-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.install b/ubuntu/_base/kdesdk/debian/kbugbuster-trinity.install
index 80072a35e..80072a35e 100644
--- a/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kbugbuster-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.manpages b/ubuntu/_base/kdesdk/debian/kbugbuster-trinity.manpages
index 8fc558a77..8fc558a77 100644
--- a/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kbugbuster-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.menu b/ubuntu/_base/kdesdk/debian/kbugbuster-trinity.menu
index 47f13168d..47f13168d 100644
--- a/ubuntu/maverick/kdesdk/debian/kbugbuster-trinity.menu
+++ b/ubuntu/_base/kdesdk/debian/kbugbuster-trinity.menu
diff --git a/ubuntu/maverick/kdesdk/debian/kcachegrind-converters-trinity.docs b/ubuntu/_base/kdesdk/debian/kcachegrind-converters-trinity.docs
index b19a948df..b19a948df 100644
--- a/ubuntu/maverick/kdesdk/debian/kcachegrind-converters-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kcachegrind-converters-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kcachegrind-converters-trinity.install b/ubuntu/_base/kdesdk/debian/kcachegrind-converters-trinity.install
index 742cfc523..742cfc523 100644
--- a/ubuntu/maverick/kdesdk/debian/kcachegrind-converters-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kcachegrind-converters-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kcachegrind-converters-trinity.manpages b/ubuntu/_base/kdesdk/debian/kcachegrind-converters-trinity.manpages
index 977c48e2d..977c48e2d 100644
--- a/ubuntu/maverick/kdesdk/debian/kcachegrind-converters-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kcachegrind-converters-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.README.Debian b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.README.Debian
index 3b9a9f290..3b9a9f290 100644
--- a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.README.Debian
+++ b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.README.Debian
diff --git a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.docs b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.docs
index aef510285..aef510285 100644
--- a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.install b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.install
index f8607173f..f8607173f 100644
--- a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.manpages b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.manpages
index f994baff0..f994baff0 100644
--- a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.menu b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.menu
index 83cd74714..83cd74714 100644
--- a/ubuntu/maverick/kdesdk/debian/kcachegrind-trinity.menu
+++ b/ubuntu/_base/kdesdk/debian/kcachegrind-trinity.menu
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia b/ubuntu/_base/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia
index b5d1310e3..b5d1310e3 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-doc-html.doc-base.cervisia
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel b/ubuntu/_base/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel
index 3921713e5..3921713e5 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-doc-html.doc-base.kbabel
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind b/ubuntu/_base/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
index ebe84bea2..ebe84bea2 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-doc-html.doc-base.kcachegrind
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello b/ubuntu/_base/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello
index 127aaff2f..127aaff2f 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-doc-html.doc-base.umbrello
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-kfile-plugins-trinity.install b/ubuntu/_base/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
index 1ffa48c57..1ffa48c57 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-kfile-plugins-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-kio-plugins-trinity.docs b/ubuntu/_base/kdesdk/debian/kdesdk-kio-plugins-trinity.docs
index bd4b4c270..bd4b4c270 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-kio-plugins-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-kio-plugins-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-kio-plugins-trinity.install b/ubuntu/_base/kdesdk/debian/kdesdk-kio-plugins-trinity.install
index f3f70394c..f3f70394c 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-kio-plugins-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-kio-plugins-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.README.Debian b/ubuntu/_base/kdesdk/debian/kdesdk-misc-trinity.README.Debian
index 03a08c2d0..03a08c2d0 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.README.Debian
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-misc-trinity.README.Debian
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.install b/ubuntu/_base/kdesdk/debian/kdesdk-misc-trinity.install
index 9fbde2ecd..9fbde2ecd 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-misc-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.links b/ubuntu/_base/kdesdk/debian/kdesdk-misc-trinity.links
index 160cea338..160cea338 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-misc-trinity.links
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-misc-trinity.links
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.README.Debian b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.README.Debian
index 7d0a6714d..7d0a6714d 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.README.Debian
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.README.Debian
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.docs b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.docs
index 490ab041d..490ab041d 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.install b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.install
index 1afc3b33d..1afc3b33d 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.lintian b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.lintian
index 91f6885f3..91f6885f3 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.lintian
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.lintian
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.manpages b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.manpages
index 07337e200..07337e200 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-scripts-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kdesdk-trinity.README.Debian b/ubuntu/_base/kdesdk/debian/kdesdk-trinity.README.Debian
index 65a65a833..65a65a833 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-trinity.README.Debian
+++ b/ubuntu/_base/kdesdk/debian/kdesdk-trinity.README.Debian
diff --git a/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.docs b/ubuntu/_base/kdesdk/debian/kmtrace-trinity.docs
index 44b289f0d..44b289f0d 100644
--- a/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kmtrace-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.install b/ubuntu/_base/kdesdk/debian/kmtrace-trinity.install
index a163246b9..a163246b9 100644
--- a/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kmtrace-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.manpages b/ubuntu/_base/kdesdk/debian/kmtrace-trinity.manpages
index 92133295d..92133295d 100644
--- a/ubuntu/maverick/kdesdk/debian/kmtrace-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kmtrace-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kompare-trinity.docs b/ubuntu/_base/kdesdk/debian/kompare-trinity.docs
index d8c52ac2e..d8c52ac2e 100644
--- a/ubuntu/maverick/kdesdk/debian/kompare-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kompare-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kompare-trinity.install b/ubuntu/_base/kdesdk/debian/kompare-trinity.install
index 111ebeea1..111ebeea1 100644
--- a/ubuntu/maverick/kdesdk/debian/kompare-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kompare-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kompare-trinity.lintian b/ubuntu/_base/kdesdk/debian/kompare-trinity.lintian
index 70173c488..70173c488 100644
--- a/ubuntu/maverick/kdesdk/debian/kompare-trinity.lintian
+++ b/ubuntu/_base/kdesdk/debian/kompare-trinity.lintian
diff --git a/ubuntu/maverick/kdesdk/debian/kompare-trinity.manpages b/ubuntu/_base/kdesdk/debian/kompare-trinity.manpages
index acf918455..acf918455 100644
--- a/ubuntu/maverick/kdesdk/debian/kompare-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kompare-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kompare-trinity.menu b/ubuntu/_base/kdesdk/debian/kompare-trinity.menu
index ddf617f34..ddf617f34 100644
--- a/ubuntu/maverick/kdesdk/debian/kompare-trinity.menu
+++ b/ubuntu/_base/kdesdk/debian/kompare-trinity.menu
diff --git a/ubuntu/maverick/kdesdk/debian/kspy-trinity.docs b/ubuntu/_base/kdesdk/debian/kspy-trinity.docs
index 755291441..755291441 100644
--- a/ubuntu/maverick/kdesdk/debian/kspy-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kspy-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kspy-trinity.install b/ubuntu/_base/kdesdk/debian/kspy-trinity.install
index 12523ee90..12523ee90 100644
--- a/ubuntu/maverick/kdesdk/debian/kspy-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kspy-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kspy-trinity.lintian b/ubuntu/_base/kdesdk/debian/kspy-trinity.lintian
index 84d9c917f..84d9c917f 100644
--- a/ubuntu/maverick/kdesdk/debian/kspy-trinity.lintian
+++ b/ubuntu/_base/kdesdk/debian/kspy-trinity.lintian
diff --git a/ubuntu/maverick/kdesdk/debian/kspy-trinity.manpages b/ubuntu/_base/kdesdk/debian/kspy-trinity.manpages
index 34831ba91..34831ba91 100644
--- a/ubuntu/maverick/kdesdk/debian/kspy-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kspy-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kuiviewer-trinity.install b/ubuntu/_base/kdesdk/debian/kuiviewer-trinity.install
index 964614988..964614988 100644
--- a/ubuntu/maverick/kdesdk/debian/kuiviewer-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kuiviewer-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/kuiviewer-trinity.manpages b/ubuntu/_base/kdesdk/debian/kuiviewer-trinity.manpages
index abcf3310b..abcf3310b 100644
--- a/ubuntu/maverick/kdesdk/debian/kuiviewer-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/kuiviewer-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/kuiviewer-trinity.menu b/ubuntu/_base/kdesdk/debian/kuiviewer-trinity.menu
index d493d6157..d493d6157 100644
--- a/ubuntu/maverick/kdesdk/debian/kuiviewer-trinity.menu
+++ b/ubuntu/_base/kdesdk/debian/kuiviewer-trinity.menu
diff --git a/ubuntu/maverick/kdesdk/debian/kunittest-trinity.docs b/ubuntu/_base/kdesdk/debian/kunittest-trinity.docs
index 029481923..029481923 100644
--- a/ubuntu/maverick/kdesdk/debian/kunittest-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/kunittest-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/kunittest-trinity.install b/ubuntu/_base/kdesdk/debian/kunittest-trinity.install
index bf4cf0b5a..bf4cf0b5a 100644
--- a/ubuntu/maverick/kdesdk/debian/kunittest-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/kunittest-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/libcvsservice-trinity-dev.docs b/ubuntu/_base/kdesdk/debian/libcvsservice-trinity-dev.docs
index 71e397bfc..71e397bfc 100644
--- a/ubuntu/maverick/kdesdk/debian/libcvsservice-trinity-dev.docs
+++ b/ubuntu/_base/kdesdk/debian/libcvsservice-trinity-dev.docs
diff --git a/ubuntu/maverick/kdesdk/debian/libcvsservice-trinity-dev.install b/ubuntu/_base/kdesdk/debian/libcvsservice-trinity-dev.install
index 7cd1252e9..7cd1252e9 100644
--- a/ubuntu/maverick/kdesdk/debian/libcvsservice-trinity-dev.install
+++ b/ubuntu/_base/kdesdk/debian/libcvsservice-trinity-dev.install
diff --git a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.docs b/ubuntu/_base/kdesdk/debian/libcvsservice0-trinity.docs
index 71e397bfc..71e397bfc 100644
--- a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/libcvsservice0-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.install b/ubuntu/_base/kdesdk/debian/libcvsservice0-trinity.install
index c1649ddd2..c1649ddd2 100644
--- a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/libcvsservice0-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.lintian b/ubuntu/_base/kdesdk/debian/libcvsservice0-trinity.lintian
index 015a481a0..015a481a0 100644
--- a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.lintian
+++ b/ubuntu/_base/kdesdk/debian/libcvsservice0-trinity.lintian
diff --git a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.manpages b/ubuntu/_base/kdesdk/debian/libcvsservice0-trinity.manpages
index 9afa8b3e7..9afa8b3e7 100644
--- a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/libcvsservice0-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/man/adddebug.1 b/ubuntu/_base/kdesdk/debian/man/adddebug.1
index b1380f6c9..b1380f6c9 100644
--- a/ubuntu/maverick/kdesdk/debian/man/adddebug.1
+++ b/ubuntu/_base/kdesdk/debian/man/adddebug.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/build-progress.sh.1 b/ubuntu/_base/kdesdk/debian/man/build-progress.sh.1
index a5cfcc3ec..a5cfcc3ec 100644
--- a/ubuntu/maverick/kdesdk/debian/man/build-progress.sh.1
+++ b/ubuntu/_base/kdesdk/debian/man/build-progress.sh.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/catalogmanager.1 b/ubuntu/_base/kdesdk/debian/man/catalogmanager.1
index 0103b556a..0103b556a 100644
--- a/ubuntu/maverick/kdesdk/debian/man/catalogmanager.1
+++ b/ubuntu/_base/kdesdk/debian/man/catalogmanager.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cheatmake.1 b/ubuntu/_base/kdesdk/debian/man/cheatmake.1
index 8aa455f27..8aa455f27 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cheatmake.1
+++ b/ubuntu/_base/kdesdk/debian/man/cheatmake.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/create_cvsignore.1 b/ubuntu/_base/kdesdk/debian/man/create_cvsignore.1
index a2ab70541..a2ab70541 100644
--- a/ubuntu/maverick/kdesdk/debian/man/create_cvsignore.1
+++ b/ubuntu/_base/kdesdk/debian/man/create_cvsignore.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/create_makefile.1 b/ubuntu/_base/kdesdk/debian/man/create_makefile.1
index c8d888e7f..c8d888e7f 100644
--- a/ubuntu/maverick/kdesdk/debian/man/create_makefile.1
+++ b/ubuntu/_base/kdesdk/debian/man/create_makefile.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/create_makefiles.1 b/ubuntu/_base/kdesdk/debian/man/create_makefiles.1
index 62ab39cfd..62ab39cfd 100644
--- a/ubuntu/maverick/kdesdk/debian/man/create_makefiles.1
+++ b/ubuntu/_base/kdesdk/debian/man/create_makefiles.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvs-clean.1 b/ubuntu/_base/kdesdk/debian/man/cvs-clean.1
index d025b000d..d025b000d 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvs-clean.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvs-clean.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvs2dist.1 b/ubuntu/_base/kdesdk/debian/man/cvs2dist.1
index 3c971c734..3c971c734 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvs2dist.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvs2dist.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvsaskpass.1 b/ubuntu/_base/kdesdk/debian/man/cvsaskpass.1
index eb7f02fdd..eb7f02fdd 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvsaskpass.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvsaskpass.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvsbackport.1 b/ubuntu/_base/kdesdk/debian/man/cvsbackport.1
index 9e58dcc3c..9e58dcc3c 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvsbackport.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvsbackport.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvscheck.1 b/ubuntu/_base/kdesdk/debian/man/cvscheck.1
index cf7576cb4..cf7576cb4 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvscheck.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvscheck.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvsforwardport.1 b/ubuntu/_base/kdesdk/debian/man/cvsforwardport.1
index 8c5e00807..8c5e00807 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvsforwardport.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvsforwardport.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvslastchange.1 b/ubuntu/_base/kdesdk/debian/man/cvslastchange.1
index 144d35a10..144d35a10 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvslastchange.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvslastchange.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvslastlog.1 b/ubuntu/_base/kdesdk/debian/man/cvslastlog.1
index c773124b3..c773124b3 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvslastlog.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvslastlog.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvsrevertlast.1 b/ubuntu/_base/kdesdk/debian/man/cvsrevertlast.1
index 0a1757ddc..0a1757ddc 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvsrevertlast.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvsrevertlast.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cvsservice.1 b/ubuntu/_base/kdesdk/debian/man/cvsservice.1
index 11a58054b..11a58054b 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cvsservice.1
+++ b/ubuntu/_base/kdesdk/debian/man/cvsservice.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/cxxmetric.1 b/ubuntu/_base/kdesdk/debian/man/cxxmetric.1
index 4d12d0759..4d12d0759 100644
--- a/ubuntu/maverick/kdesdk/debian/man/cxxmetric.1
+++ b/ubuntu/_base/kdesdk/debian/man/cxxmetric.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/demangle.1 b/ubuntu/_base/kdesdk/debian/man/demangle.1
index 0719fe1f4..0719fe1f4 100644
--- a/ubuntu/maverick/kdesdk/debian/man/demangle.1
+++ b/ubuntu/_base/kdesdk/debian/man/demangle.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/dprof2calltree.1 b/ubuntu/_base/kdesdk/debian/man/dprof2calltree.1
index f1e7691a4..f1e7691a4 100644
--- a/ubuntu/maverick/kdesdk/debian/man/dprof2calltree.1
+++ b/ubuntu/_base/kdesdk/debian/man/dprof2calltree.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/extend_dmalloc.1 b/ubuntu/_base/kdesdk/debian/man/extend_dmalloc.1
index 8bd4fcac4..8bd4fcac4 100644
--- a/ubuntu/maverick/kdesdk/debian/man/extend_dmalloc.1
+++ b/ubuntu/_base/kdesdk/debian/man/extend_dmalloc.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/extractattr.1 b/ubuntu/_base/kdesdk/debian/man/extractattr.1
index fe223fc1f..fe223fc1f 100644
--- a/ubuntu/maverick/kdesdk/debian/man/extractattr.1
+++ b/ubuntu/_base/kdesdk/debian/man/extractattr.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/extractrc.1 b/ubuntu/_base/kdesdk/debian/man/extractrc.1
index de8ac9546..de8ac9546 100644
--- a/ubuntu/maverick/kdesdk/debian/man/extractrc.1
+++ b/ubuntu/_base/kdesdk/debian/man/extractrc.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/findmissingcrystal.1 b/ubuntu/_base/kdesdk/debian/man/findmissingcrystal.1
index f780c3ad0..f780c3ad0 100644
--- a/ubuntu/maverick/kdesdk/debian/man/findmissingcrystal.1
+++ b/ubuntu/_base/kdesdk/debian/man/findmissingcrystal.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/fixkdeincludes.1 b/ubuntu/_base/kdesdk/debian/man/fixkdeincludes.1
index c7a75a2f3..c7a75a2f3 100644
--- a/ubuntu/maverick/kdesdk/debian/man/fixkdeincludes.1
+++ b/ubuntu/_base/kdesdk/debian/man/fixkdeincludes.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/fixuifiles.1 b/ubuntu/_base/kdesdk/debian/man/fixuifiles.1
index 62ed8d738..62ed8d738 100644
--- a/ubuntu/maverick/kdesdk/debian/man/fixuifiles.1
+++ b/ubuntu/_base/kdesdk/debian/man/fixuifiles.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/hotshot2calltree.1 b/ubuntu/_base/kdesdk/debian/man/hotshot2calltree.1
index 3b31794aa..3b31794aa 100644
--- a/ubuntu/maverick/kdesdk/debian/man/hotshot2calltree.1
+++ b/ubuntu/_base/kdesdk/debian/man/hotshot2calltree.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kapptemplate.1 b/ubuntu/_base/kdesdk/debian/man/kapptemplate.1
index acfcc1100..acfcc1100 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kapptemplate.1
+++ b/ubuntu/_base/kdesdk/debian/man/kapptemplate.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kbabel.1 b/ubuntu/_base/kdesdk/debian/man/kbabel.1
index 0b8b8eae1..0b8b8eae1 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kbabel.1
+++ b/ubuntu/_base/kdesdk/debian/man/kbabel.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kbabeldict.1 b/ubuntu/_base/kdesdk/debian/man/kbabeldict.1
index 1c267bcc9..1c267bcc9 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kbabeldict.1
+++ b/ubuntu/_base/kdesdk/debian/man/kbabeldict.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kbugbuster.1 b/ubuntu/_base/kdesdk/debian/man/kbugbuster.1
index c16006086..c16006086 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kbugbuster.1
+++ b/ubuntu/_base/kdesdk/debian/man/kbugbuster.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kcachegrind.1 b/ubuntu/_base/kdesdk/debian/man/kcachegrind.1
index 58b6e8bad..58b6e8bad 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kcachegrind.1
+++ b/ubuntu/_base/kdesdk/debian/man/kcachegrind.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kdedoc.1 b/ubuntu/_base/kdesdk/debian/man/kdedoc.1
index 684a6ad47..684a6ad47 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kdedoc.1
+++ b/ubuntu/_base/kdesdk/debian/man/kdedoc.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kdekillall.1 b/ubuntu/_base/kdesdk/debian/man/kdekillall.1
index 2a2c5c8a5..2a2c5c8a5 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kdekillall.1
+++ b/ubuntu/_base/kdesdk/debian/man/kdekillall.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kdelnk2desktop.py.1 b/ubuntu/_base/kdesdk/debian/man/kdelnk2desktop.py.1
index cba89c7b0..cba89c7b0 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kdelnk2desktop.py.1
+++ b/ubuntu/_base/kdesdk/debian/man/kdelnk2desktop.py.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kdemangen.pl.1 b/ubuntu/_base/kdesdk/debian/man/kdemangen.pl.1
index 0570f4f5c..0570f4f5c 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kdemangen.pl.1
+++ b/ubuntu/_base/kdesdk/debian/man/kdemangen.pl.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kminspector.1 b/ubuntu/_base/kdesdk/debian/man/kminspector.1
index 911e890bf..911e890bf 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kminspector.1
+++ b/ubuntu/_base/kdesdk/debian/man/kminspector.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kmmatch.1 b/ubuntu/_base/kdesdk/debian/man/kmmatch.1
index f8ceee27b..f8ceee27b 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kmmatch.1
+++ b/ubuntu/_base/kdesdk/debian/man/kmmatch.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kmtrace.1 b/ubuntu/_base/kdesdk/debian/man/kmtrace.1
index d51644bef..d51644bef 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kmtrace.1
+++ b/ubuntu/_base/kdesdk/debian/man/kmtrace.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kompare.1 b/ubuntu/_base/kdesdk/debian/man/kompare.1
index ab3b696c6..ab3b696c6 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kompare.1
+++ b/ubuntu/_base/kdesdk/debian/man/kompare.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/kuiviewer.1 b/ubuntu/_base/kdesdk/debian/man/kuiviewer.1
index fe57f3714..fe57f3714 100644
--- a/ubuntu/maverick/kdesdk/debian/man/kuiviewer.1
+++ b/ubuntu/_base/kdesdk/debian/man/kuiviewer.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/licensecheck.1 b/ubuntu/_base/kdesdk/debian/man/licensecheck.1
index 541014d63..541014d63 100644
--- a/ubuntu/maverick/kdesdk/debian/man/licensecheck.1
+++ b/ubuntu/_base/kdesdk/debian/man/licensecheck.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/makeobj.1 b/ubuntu/_base/kdesdk/debian/man/makeobj.1
index 48f8d0adb..48f8d0adb 100644
--- a/ubuntu/maverick/kdesdk/debian/man/makeobj.1
+++ b/ubuntu/_base/kdesdk/debian/man/makeobj.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/memprof2calltree.1 b/ubuntu/_base/kdesdk/debian/man/memprof2calltree.1
index 0bd0582a3..0bd0582a3 100644
--- a/ubuntu/maverick/kdesdk/debian/man/memprof2calltree.1
+++ b/ubuntu/_base/kdesdk/debian/man/memprof2calltree.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/op2calltree.1 b/ubuntu/_base/kdesdk/debian/man/op2calltree.1
index c81836a46..c81836a46 100644
--- a/ubuntu/maverick/kdesdk/debian/man/op2calltree.1
+++ b/ubuntu/_base/kdesdk/debian/man/op2calltree.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/package_crystalsvg.1 b/ubuntu/_base/kdesdk/debian/man/package_crystalsvg.1
index 64e0f888c..64e0f888c 100644
--- a/ubuntu/maverick/kdesdk/debian/man/package_crystalsvg.1
+++ b/ubuntu/_base/kdesdk/debian/man/package_crystalsvg.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/png2mng.pl.1 b/ubuntu/_base/kdesdk/debian/man/png2mng.pl.1
index cc10dd511..cc10dd511 100644
--- a/ubuntu/maverick/kdesdk/debian/man/png2mng.pl.1
+++ b/ubuntu/_base/kdesdk/debian/man/png2mng.pl.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/po2xml.1 b/ubuntu/_base/kdesdk/debian/man/po2xml.1
index d1be83c89..d1be83c89 100644
--- a/ubuntu/maverick/kdesdk/debian/man/po2xml.1
+++ b/ubuntu/_base/kdesdk/debian/man/po2xml.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/pprof2calltree.1 b/ubuntu/_base/kdesdk/debian/man/pprof2calltree.1
index dc80f91ad..dc80f91ad 100644
--- a/ubuntu/maverick/kdesdk/debian/man/pprof2calltree.1
+++ b/ubuntu/_base/kdesdk/debian/man/pprof2calltree.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/pruneemptydirs.1 b/ubuntu/_base/kdesdk/debian/man/pruneemptydirs.1
index 93c33cea9..93c33cea9 100644
--- a/ubuntu/maverick/kdesdk/debian/man/pruneemptydirs.1
+++ b/ubuntu/_base/kdesdk/debian/man/pruneemptydirs.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/qtdoc.1 b/ubuntu/_base/kdesdk/debian/man/qtdoc.1
index 1559c25b4..1559c25b4 100644
--- a/ubuntu/maverick/kdesdk/debian/man/qtdoc.1
+++ b/ubuntu/_base/kdesdk/debian/man/qtdoc.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/split2po.1 b/ubuntu/_base/kdesdk/debian/man/split2po.1
index 4269f815b..4269f815b 100644
--- a/ubuntu/maverick/kdesdk/debian/man/split2po.1
+++ b/ubuntu/_base/kdesdk/debian/man/split2po.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/swappo.1 b/ubuntu/_base/kdesdk/debian/man/swappo.1
index 96a6d3f94..96a6d3f94 100644
--- a/ubuntu/maverick/kdesdk/debian/man/swappo.1
+++ b/ubuntu/_base/kdesdk/debian/man/swappo.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/testkspy.1 b/ubuntu/_base/kdesdk/debian/man/testkspy.1
index c04e00c0f..c04e00c0f 100644
--- a/ubuntu/maverick/kdesdk/debian/man/testkspy.1
+++ b/ubuntu/_base/kdesdk/debian/man/testkspy.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/transxx.1 b/ubuntu/_base/kdesdk/debian/man/transxx.1
index f7c843fc9..f7c843fc9 100644
--- a/ubuntu/maverick/kdesdk/debian/man/transxx.1
+++ b/ubuntu/_base/kdesdk/debian/man/transxx.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/umbrello.1 b/ubuntu/_base/kdesdk/debian/man/umbrello.1
index ab63662b9..ab63662b9 100644
--- a/ubuntu/maverick/kdesdk/debian/man/umbrello.1
+++ b/ubuntu/_base/kdesdk/debian/man/umbrello.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/xml2pot.1 b/ubuntu/_base/kdesdk/debian/man/xml2pot.1
index d0920db54..d0920db54 100644
--- a/ubuntu/maverick/kdesdk/debian/man/xml2pot.1
+++ b/ubuntu/_base/kdesdk/debian/man/xml2pot.1
diff --git a/ubuntu/maverick/kdesdk/debian/man/zonetab2pot.py.1 b/ubuntu/_base/kdesdk/debian/man/zonetab2pot.py.1
index b7115ad20..b7115ad20 100644
--- a/ubuntu/maverick/kdesdk/debian/man/zonetab2pot.py.1
+++ b/ubuntu/_base/kdesdk/debian/man/zonetab2pot.py.1
diff --git a/ubuntu/maverick/kdesdk/debian/not-installed.list b/ubuntu/_base/kdesdk/debian/not-installed.list
index f801ede2f..f801ede2f 100644
--- a/ubuntu/maverick/kdesdk/debian/not-installed.list
+++ b/ubuntu/_base/kdesdk/debian/not-installed.list
diff --git a/ubuntu/maverick/kdesdk/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdesdk/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdesdk/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdesdk/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdesdk/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdesdk/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdesdk/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdesdk/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdesdk/debian/patches/series b/ubuntu/_base/kdesdk/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdesdk/debian/patches/series
+++ b/ubuntu/_base/kdesdk/debian/patches/series
diff --git a/ubuntu/maverick/kdesdk/debian/poxml-trinity.README.Debian b/ubuntu/_base/kdesdk/debian/poxml-trinity.README.Debian
index 0b5434012..0b5434012 100644
--- a/ubuntu/maverick/kdesdk/debian/poxml-trinity.README.Debian
+++ b/ubuntu/_base/kdesdk/debian/poxml-trinity.README.Debian
diff --git a/ubuntu/maverick/kdesdk/debian/poxml-trinity.install b/ubuntu/_base/kdesdk/debian/poxml-trinity.install
index 290c62266..290c62266 100644
--- a/ubuntu/maverick/kdesdk/debian/poxml-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/poxml-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/poxml-trinity.manpages b/ubuntu/_base/kdesdk/debian/poxml-trinity.manpages
index 05e2191bf..05e2191bf 100644
--- a/ubuntu/maverick/kdesdk/debian/poxml-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/poxml-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/rules b/ubuntu/_base/kdesdk/debian/rules
index b382ba355..b382ba355 100755
--- a/ubuntu/maverick/kdesdk/debian/rules
+++ b/ubuntu/_base/kdesdk/debian/rules
diff --git a/ubuntu/maverick/kdesdk/debian/source/format b/ubuntu/_base/kdesdk/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdesdk/debian/source/format
+++ b/ubuntu/_base/kdesdk/debian/source/format
diff --git a/ubuntu/maverick/kdesdk/debian/source/options b/ubuntu/_base/kdesdk/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdesdk/debian/source/options
+++ b/ubuntu/_base/kdesdk/debian/source/options
diff --git a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.README.Debian b/ubuntu/_base/kdesdk/debian/umbrello-trinity.README.Debian
index 0ba895e00..0ba895e00 100644
--- a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.README.Debian
+++ b/ubuntu/_base/kdesdk/debian/umbrello-trinity.README.Debian
diff --git a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.docs b/ubuntu/_base/kdesdk/debian/umbrello-trinity.docs
index 07bf3446c..07bf3446c 100644
--- a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.docs
+++ b/ubuntu/_base/kdesdk/debian/umbrello-trinity.docs
diff --git a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.install b/ubuntu/_base/kdesdk/debian/umbrello-trinity.install
index 2ddf21a77..2ddf21a77 100644
--- a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.install
+++ b/ubuntu/_base/kdesdk/debian/umbrello-trinity.install
diff --git a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.lintian b/ubuntu/_base/kdesdk/debian/umbrello-trinity.lintian
index 17c9ba52c..17c9ba52c 100644
--- a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.lintian
+++ b/ubuntu/_base/kdesdk/debian/umbrello-trinity.lintian
diff --git a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.manpages b/ubuntu/_base/kdesdk/debian/umbrello-trinity.manpages
index 537bedefe..537bedefe 100644
--- a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.manpages
+++ b/ubuntu/_base/kdesdk/debian/umbrello-trinity.manpages
diff --git a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.menu b/ubuntu/_base/kdesdk/debian/umbrello-trinity.menu
index 1c8e990b1..1c8e990b1 100644
--- a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.menu
+++ b/ubuntu/_base/kdesdk/debian/umbrello-trinity.menu
diff --git a/ubuntu/maverick/kdetoys/debian/amor-trinity.README.Debian b/ubuntu/_base/kdetoys/debian/amor-trinity.README.Debian
index 5572b0856..5572b0856 100644
--- a/ubuntu/maverick/kdetoys/debian/amor-trinity.README.Debian
+++ b/ubuntu/_base/kdetoys/debian/amor-trinity.README.Debian
diff --git a/ubuntu/maverick/kdetoys/debian/amor-trinity.docs b/ubuntu/_base/kdetoys/debian/amor-trinity.docs
index 114e58b83..114e58b83 100644
--- a/ubuntu/maverick/kdetoys/debian/amor-trinity.docs
+++ b/ubuntu/_base/kdetoys/debian/amor-trinity.docs
diff --git a/ubuntu/maverick/kdetoys/debian/amor-trinity.install b/ubuntu/_base/kdetoys/debian/amor-trinity.install
index 50d346773..50d346773 100644
--- a/ubuntu/maverick/kdetoys/debian/amor-trinity.install
+++ b/ubuntu/_base/kdetoys/debian/amor-trinity.install
diff --git a/ubuntu/maverick/kdetoys/debian/amor-trinity.manpages b/ubuntu/_base/kdetoys/debian/amor-trinity.manpages
index 715e595ce..715e595ce 100644
--- a/ubuntu/maverick/kdetoys/debian/amor-trinity.manpages
+++ b/ubuntu/_base/kdetoys/debian/amor-trinity.manpages
diff --git a/ubuntu/maverick/kdetoys/debian/amor-trinity.menu b/ubuntu/_base/kdetoys/debian/amor-trinity.menu
index e9e9144ca..e9e9144ca 100644
--- a/ubuntu/maverick/kdetoys/debian/amor-trinity.menu
+++ b/ubuntu/_base/kdetoys/debian/amor-trinity.menu
diff --git a/ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdetoys/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/ubuntu/maverick/kdetoys/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdetoys/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdetoys/debian/cdbs/kde.mk b/ubuntu/_base/kdetoys/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/kdetoys/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdetoys/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdetoys/debian/cdbs/versions.pl b/ubuntu/_base/kdetoys/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdetoys/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdetoys/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdetoys/debian/changelog b/ubuntu/_base/kdetoys/debian/changelog
index d15c14df5..d15c14df5 100644
--- a/ubuntu/maverick/kdetoys/debian/changelog
+++ b/ubuntu/_base/kdetoys/debian/changelog
diff --git a/ubuntu/maverick/kdetoys/debian/compat b/ubuntu/_base/kdetoys/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdetoys/debian/compat
+++ b/ubuntu/_base/kdetoys/debian/compat
diff --git a/ubuntu/maverick/kdetoys/debian/control b/ubuntu/_base/kdetoys/debian/control
index 14ecc399e..14ecc399e 100644
--- a/ubuntu/maverick/kdetoys/debian/control
+++ b/ubuntu/_base/kdetoys/debian/control
diff --git a/ubuntu/maverick/kdetoys/debian/copyright b/ubuntu/_base/kdetoys/debian/copyright
index 0fbdac055..0fbdac055 100644
--- a/ubuntu/maverick/kdetoys/debian/copyright
+++ b/ubuntu/_base/kdetoys/debian/copyright
diff --git a/ubuntu/maverick/kdetoys/debian/eyesapplet-trinity.install b/ubuntu/_base/kdetoys/debian/eyesapplet-trinity.install
index 60e3c7b16..60e3c7b16 100644
--- a/ubuntu/maverick/kdetoys/debian/eyesapplet-trinity.install
+++ b/ubuntu/_base/kdetoys/debian/eyesapplet-trinity.install
diff --git a/ubuntu/maverick/kdetoys/debian/fifteenapplet-trinity.install b/ubuntu/_base/kdetoys/debian/fifteenapplet-trinity.install
index d54014b4b..d54014b4b 100644
--- a/ubuntu/maverick/kdetoys/debian/fifteenapplet-trinity.install
+++ b/ubuntu/_base/kdetoys/debian/fifteenapplet-trinity.install
diff --git a/ubuntu/maverick/kdetoys/debian/icons/amor.xpm b/ubuntu/_base/kdetoys/debian/icons/amor.xpm
index b3d73b366..b3d73b366 100644
--- a/ubuntu/maverick/kdetoys/debian/icons/amor.xpm
+++ b/ubuntu/_base/kdetoys/debian/icons/amor.xpm
diff --git a/ubuntu/maverick/kdetoys/debian/icons/kodo.xpm b/ubuntu/_base/kdetoys/debian/icons/kodo.xpm
index 8d73544a8..8d73544a8 100644
--- a/ubuntu/maverick/kdetoys/debian/icons/kodo.xpm
+++ b/ubuntu/_base/kdetoys/debian/icons/kodo.xpm
diff --git a/ubuntu/maverick/kdetoys/debian/icons/kteatime.xpm b/ubuntu/_base/kdetoys/debian/icons/kteatime.xpm
index d3bfd04e3..d3bfd04e3 100644
--- a/ubuntu/maverick/kdetoys/debian/icons/kteatime.xpm
+++ b/ubuntu/_base/kdetoys/debian/icons/kteatime.xpm
diff --git a/ubuntu/maverick/kdetoys/debian/icons/ktux.xpm b/ubuntu/_base/kdetoys/debian/icons/ktux.xpm
index 1067dd22a..1067dd22a 100644
--- a/ubuntu/maverick/kdetoys/debian/icons/ktux.xpm
+++ b/ubuntu/_base/kdetoys/debian/icons/ktux.xpm
diff --git a/ubuntu/maverick/kdetoys/debian/icons/kworldclock.xpm b/ubuntu/_base/kdetoys/debian/icons/kworldclock.xpm
index cee61a9a5..cee61a9a5 100644
--- a/ubuntu/maverick/kdetoys/debian/icons/kworldclock.xpm
+++ b/ubuntu/_base/kdetoys/debian/icons/kworldclock.xpm
diff --git a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.amor b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.amor
index b4b9634b6..b4b9634b6 100644
--- a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.amor
+++ b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.amor
diff --git a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon
index a05e482b6..a05e482b6 100644
--- a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon
+++ b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kmoon
diff --git a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kodo b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kodo
index a59297a0f..a59297a0f 100644
--- a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kodo
+++ b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kodo
diff --git a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime
index 86b8601e8..86b8601e8 100644
--- a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime
+++ b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kteatime
diff --git a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kweather b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kweather
index 01fd7e68e..01fd7e68e 100644
--- a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kweather
+++ b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kweather
diff --git a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock
index 00fa1290b..00fa1290b 100644
--- a/ubuntu/maverick/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock
+++ b/ubuntu/_base/kdetoys/debian/kdetoys-doc-html.doc-base.kworldclock
diff --git a/ubuntu/maverick/kdetoys/debian/kdetoys-trinity.README.Debian b/ubuntu/_base/kdetoys/debian/kdetoys-trinity.README.Debian
index 5dd67c1e8..5dd67c1e8 100644
--- a/ubuntu/maverick/kdetoys/debian/kdetoys-trinity.README.Debian
+++ b/ubuntu/_base/kdetoys/debian/kdetoys-trinity.README.Debian
diff --git a/ubuntu/maverick/kdetoys/debian/kmoon-trinity.README.Debian b/ubuntu/_base/kdetoys/debian/kmoon-trinity.README.Debian
index 3c73a9827..3c73a9827 100644
--- a/ubuntu/maverick/kdetoys/debian/kmoon-trinity.README.Debian
+++ b/ubuntu/_base/kdetoys/debian/kmoon-trinity.README.Debian
diff --git a/ubuntu/maverick/kdetoys/debian/kmoon-trinity.docs b/ubuntu/_base/kdetoys/debian/kmoon-trinity.docs
index be1167729..be1167729 100644
--- a/ubuntu/maverick/kdetoys/debian/kmoon-trinity.docs
+++ b/ubuntu/_base/kdetoys/debian/kmoon-trinity.docs
diff --git a/ubuntu/maverick/kdetoys/debian/kmoon-trinity.install b/ubuntu/_base/kdetoys/debian/kmoon-trinity.install
index 818d57926..818d57926 100644
--- a/ubuntu/maverick/kdetoys/debian/kmoon-trinity.install
+++ b/ubuntu/_base/kdetoys/debian/kmoon-trinity.install
diff --git a/ubuntu/maverick/kdetoys/debian/kodo-trinity.README.Debian b/ubuntu/_base/kdetoys/debian/kodo-trinity.README.Debian
index 39b677649..39b677649 100644
--- a/ubuntu/maverick/kdetoys/debian/kodo-trinity.README.Debian
+++ b/ubuntu/_base/kdetoys/debian/kodo-trinity.README.Debian
diff --git a/ubuntu/maverick/kdetoys/debian/kodo-trinity.install b/ubuntu/_base/kdetoys/debian/kodo-trinity.install
index e3563ae4c..e3563ae4c 100644
--- a/ubuntu/maverick/kdetoys/debian/kodo-trinity.install
+++ b/ubuntu/_base/kdetoys/debian/kodo-trinity.install
diff --git a/ubuntu/maverick/kdetoys/debian/kodo-trinity.manpages b/ubuntu/_base/kdetoys/debian/kodo-trinity.manpages
index 8c05387cb..8c05387cb 100644
--- a/ubuntu/maverick/kdetoys/debian/kodo-trinity.manpages
+++ b/ubuntu/_base/kdetoys/debian/kodo-trinity.manpages
diff --git a/ubuntu/maverick/kdetoys/debian/kodo-trinity.menu b/ubuntu/_base/kdetoys/debian/kodo-trinity.menu
index f9017ae75..f9017ae75 100644
--- a/ubuntu/maverick/kdetoys/debian/kodo-trinity.menu
+++ b/ubuntu/_base/kdetoys/debian/kodo-trinity.menu
diff --git a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.README.Debian b/ubuntu/_base/kdetoys/debian/kteatime-trinity.README.Debian
index 972e574e3..972e574e3 100644
--- a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.README.Debian
+++ b/ubuntu/_base/kdetoys/debian/kteatime-trinity.README.Debian
diff --git a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.docs b/ubuntu/_base/kdetoys/debian/kteatime-trinity.docs
index 30b44fbbd..30b44fbbd 100644
--- a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.docs
+++ b/ubuntu/_base/kdetoys/debian/kteatime-trinity.docs
diff --git a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.install b/ubuntu/_base/kdetoys/debian/kteatime-trinity.install
index dcf1742c4..dcf1742c4 100644
--- a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.install
+++ b/ubuntu/_base/kdetoys/debian/kteatime-trinity.install
diff --git a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.manpages b/ubuntu/_base/kdetoys/debian/kteatime-trinity.manpages
index 1ee95dba6..1ee95dba6 100644
--- a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.manpages
+++ b/ubuntu/_base/kdetoys/debian/kteatime-trinity.manpages
diff --git a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.menu b/ubuntu/_base/kdetoys/debian/kteatime-trinity.menu
index c0c53fcde..c0c53fcde 100644
--- a/ubuntu/maverick/kdetoys/debian/kteatime-trinity.menu
+++ b/ubuntu/_base/kdetoys/debian/kteatime-trinity.menu
diff --git a/ubuntu/maverick/kdetoys/debian/ktux-trinity.docs b/ubuntu/_base/kdetoys/debian/ktux-trinity.docs
index 1b5212f4a..1b5212f4a 100644
--- a/ubuntu/maverick/kdetoys/debian/ktux-trinity.docs
+++ b/ubuntu/_base/kdetoys/debian/ktux-trinity.docs
diff --git a/ubuntu/maverick/kdetoys/debian/ktux-trinity.install b/ubuntu/_base/kdetoys/debian/ktux-trinity.install
index e602a0125..e602a0125 100644
--- a/ubuntu/maverick/kdetoys/debian/ktux-trinity.install
+++ b/ubuntu/_base/kdetoys/debian/ktux-trinity.install
diff --git a/ubuntu/maverick/kdetoys/debian/ktux-trinity.manpages b/ubuntu/_base/kdetoys/debian/ktux-trinity.manpages
index 80aaacf1a..80aaacf1a 100644
--- a/ubuntu/maverick/kdetoys/debian/ktux-trinity.manpages
+++ b/ubuntu/_base/kdetoys/debian/ktux-trinity.manpages
diff --git a/ubuntu/maverick/kdetoys/debian/ktux-trinity.menu b/ubuntu/_base/kdetoys/debian/ktux-trinity.menu
index 9e6c517a8..9e6c517a8 100644
--- a/ubuntu/maverick/kdetoys/debian/ktux-trinity.menu
+++ b/ubuntu/_base/kdetoys/debian/ktux-trinity.menu
diff --git a/ubuntu/maverick/kdetoys/debian/kweather-trinity.README.Debian b/ubuntu/_base/kdetoys/debian/kweather-trinity.README.Debian
index 815ca9c50..815ca9c50 100644
--- a/ubuntu/maverick/kdetoys/debian/kweather-trinity.README.Debian
+++ b/ubuntu/_base/kdetoys/debian/kweather-trinity.README.Debian
diff --git a/ubuntu/maverick/kdetoys/debian/kweather-trinity.docs b/ubuntu/_base/kdetoys/debian/kweather-trinity.docs
index 30669d601..30669d601 100644
--- a/ubuntu/maverick/kdetoys/debian/kweather-trinity.docs
+++ b/ubuntu/_base/kdetoys/debian/kweather-trinity.docs
diff --git a/ubuntu/maverick/kdetoys/debian/kweather-trinity.install b/ubuntu/_base/kdetoys/debian/kweather-trinity.install
index 767bf0dc2..767bf0dc2 100644
--- a/ubuntu/maverick/kdetoys/debian/kweather-trinity.install
+++ b/ubuntu/_base/kdetoys/debian/kweather-trinity.install
diff --git a/ubuntu/maverick/kdetoys/debian/kweather-trinity.lintian b/ubuntu/_base/kdetoys/debian/kweather-trinity.lintian
index adb549884..adb549884 100644
--- a/ubuntu/maverick/kdetoys/debian/kweather-trinity.lintian
+++ b/ubuntu/_base/kdetoys/debian/kweather-trinity.lintian
diff --git a/ubuntu/maverick/kdetoys/debian/kweather-trinity.manpages b/ubuntu/_base/kdetoys/debian/kweather-trinity.manpages
index d4c1b98bb..d4c1b98bb 100644
--- a/ubuntu/maverick/kdetoys/debian/kweather-trinity.manpages
+++ b/ubuntu/_base/kdetoys/debian/kweather-trinity.manpages
diff --git a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.README.Debian b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.README.Debian
index 4824666ae..4824666ae 100644
--- a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.README.Debian
+++ b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.README.Debian
diff --git a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.install b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.install
index ba9a38321..ba9a38321 100644
--- a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.install
+++ b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.install
diff --git a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.manpages b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.manpages
index 114028079..114028079 100644
--- a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.manpages
+++ b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.manpages
diff --git a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.menu b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.menu
index 127766bf5..127766bf5 100644
--- a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.menu
+++ b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.menu
diff --git a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.postinst b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.postinst
index 9e2c0df3e..9e2c0df3e 100644
--- a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.postinst
+++ b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.postinst
diff --git a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.prerm b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.prerm
index b31a8a6ad..b31a8a6ad 100644
--- a/ubuntu/maverick/kdetoys/debian/kworldclock-trinity.prerm
+++ b/ubuntu/_base/kdetoys/debian/kworldclock-trinity.prerm
diff --git a/ubuntu/maverick/kdetoys/debian/man/amor-trinity.1 b/ubuntu/_base/kdetoys/debian/man/amor-trinity.1
index b381c3293..b381c3293 100644
--- a/ubuntu/maverick/kdetoys/debian/man/amor-trinity.1
+++ b/ubuntu/_base/kdetoys/debian/man/amor-trinity.1
diff --git a/ubuntu/maverick/kdetoys/debian/man/kodo-trinity.1 b/ubuntu/_base/kdetoys/debian/man/kodo-trinity.1
index 940f71987..940f71987 100644
--- a/ubuntu/maverick/kdetoys/debian/man/kodo-trinity.1
+++ b/ubuntu/_base/kdetoys/debian/man/kodo-trinity.1
diff --git a/ubuntu/maverick/kdetoys/debian/man/kteatime-trinity.1 b/ubuntu/_base/kdetoys/debian/man/kteatime-trinity.1
index 09b73bee4..09b73bee4 100644
--- a/ubuntu/maverick/kdetoys/debian/man/kteatime-trinity.1
+++ b/ubuntu/_base/kdetoys/debian/man/kteatime-trinity.1
diff --git a/ubuntu/maverick/kdetoys/debian/man/ktux-trinity.1 b/ubuntu/_base/kdetoys/debian/man/ktux-trinity.1
index bb26dc867..bb26dc867 100644
--- a/ubuntu/maverick/kdetoys/debian/man/ktux-trinity.1
+++ b/ubuntu/_base/kdetoys/debian/man/ktux-trinity.1
diff --git a/ubuntu/maverick/kdetoys/debian/man/kweatherreport-trinity.1 b/ubuntu/_base/kdetoys/debian/man/kweatherreport-trinity.1
index 1d6834ca0..1d6834ca0 100644
--- a/ubuntu/maverick/kdetoys/debian/man/kweatherreport-trinity.1
+++ b/ubuntu/_base/kdetoys/debian/man/kweatherreport-trinity.1
diff --git a/ubuntu/maverick/kdetoys/debian/man/kweatherservice-trinity.1 b/ubuntu/_base/kdetoys/debian/man/kweatherservice-trinity.1
index 86cfc499f..86cfc499f 100644
--- a/ubuntu/maverick/kdetoys/debian/man/kweatherservice-trinity.1
+++ b/ubuntu/_base/kdetoys/debian/man/kweatherservice-trinity.1
diff --git a/ubuntu/maverick/kdetoys/debian/man/kworldclock-trinity.1 b/ubuntu/_base/kdetoys/debian/man/kworldclock-trinity.1
index 29fa63a9b..29fa63a9b 100644
--- a/ubuntu/maverick/kdetoys/debian/man/kworldclock-trinity.1
+++ b/ubuntu/_base/kdetoys/debian/man/kworldclock-trinity.1
diff --git a/ubuntu/maverick/kdetoys/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdetoys/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdetoys/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdetoys/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdetoys/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdetoys/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdetoys/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdetoys/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdetoys/debian/patches/series b/ubuntu/_base/kdetoys/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdetoys/debian/patches/series
+++ b/ubuntu/_base/kdetoys/debian/patches/series
diff --git a/ubuntu/maverick/kdetoys/debian/rules b/ubuntu/_base/kdetoys/debian/rules
index 96f3778ee..96f3778ee 100755
--- a/ubuntu/maverick/kdetoys/debian/rules
+++ b/ubuntu/_base/kdetoys/debian/rules
diff --git a/ubuntu/maverick/kdetoys/debian/source/format b/ubuntu/_base/kdetoys/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdetoys/debian/source/format
+++ b/ubuntu/_base/kdetoys/debian/source/format
diff --git a/ubuntu/maverick/kdetoys/debian/source/options b/ubuntu/_base/kdetoys/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdetoys/debian/source/options
+++ b/ubuntu/_base/kdetoys/debian/source/options
diff --git a/ubuntu/maverick/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 2a0aadb8d..2a0aadb8d 100644
--- a/ubuntu/maverick/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdeutils/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/_base/kdeutils/debian/ark-trinity-trinity.lintian
index c4771fe04..c4771fe04 100644
--- a/ubuntu/maverick/kdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/_base/kdeutils/debian/ark-trinity-trinity.lintian
diff --git a/ubuntu/maverick/kdeutils/debian/ark-trinity.install b/ubuntu/_base/kdeutils/debian/ark-trinity.install
index b8aceed9b..b8aceed9b 100644
--- a/ubuntu/maverick/kdeutils/debian/ark-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/ark-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/ark-trinity.manpages b/ubuntu/_base/kdeutils/debian/ark-trinity.manpages
index 37ed04716..37ed04716 100644
--- a/ubuntu/maverick/kdeutils/debian/ark-trinity.manpages
+++ b/ubuntu/_base/kdeutils/debian/ark-trinity.manpages
diff --git a/ubuntu/maverick/kdeutils/debian/ark-trinity.menu b/ubuntu/_base/kdeutils/debian/ark-trinity.menu
index e6d567e2e..e6d567e2e 100644
--- a/ubuntu/maverick/kdeutils/debian/ark-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/ark-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/ark-trinity.mime b/ubuntu/_base/kdeutils/debian/ark-trinity.mime
index a46ab8432..a46ab8432 100644
--- a/ubuntu/maverick/kdeutils/debian/ark-trinity.mime
+++ b/ubuntu/_base/kdeutils/debian/ark-trinity.mime
diff --git a/ubuntu/maverick/kdeutils/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdeutils/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/ubuntu/maverick/kdeutils/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdeutils/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdeutils/debian/cdbs/kde.mk b/ubuntu/_base/kdeutils/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/kdeutils/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdeutils/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdeutils/debian/cdbs/versions.pl b/ubuntu/_base/kdeutils/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdeutils/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdeutils/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdeutils/debian/changelog b/ubuntu/_base/kdeutils/debian/changelog
index 0835dfb62..0835dfb62 100644
--- a/ubuntu/maverick/kdeutils/debian/changelog
+++ b/ubuntu/_base/kdeutils/debian/changelog
diff --git a/ubuntu/maverick/kdeutils/debian/compat b/ubuntu/_base/kdeutils/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdeutils/debian/compat
+++ b/ubuntu/_base/kdeutils/debian/compat
diff --git a/ubuntu/maverick/kdeutils/debian/control b/ubuntu/_base/kdeutils/debian/control
index 0de5acc8c..0de5acc8c 100644
--- a/ubuntu/maverick/kdeutils/debian/control
+++ b/ubuntu/_base/kdeutils/debian/control
diff --git a/ubuntu/maverick/kdeutils/debian/copyright b/ubuntu/_base/kdeutils/debian/copyright
index f1f81fe64..f1f81fe64 100644
--- a/ubuntu/maverick/kdeutils/debian/copyright
+++ b/ubuntu/_base/kdeutils/debian/copyright
diff --git a/ubuntu/maverick/kdeutils/debian/icons/ark-16.xpm b/ubuntu/_base/kdeutils/debian/icons/ark-16.xpm
index 4a5e3da20..4a5e3da20 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/ark-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/ark-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/ark.xpm b/ubuntu/_base/kdeutils/debian/icons/ark.xpm
index 4210cd20c..4210cd20c 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/ark.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/ark.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kcalc-16.xpm b/ubuntu/_base/kdeutils/debian/icons/kcalc-16.xpm
index 96b3358af..96b3358af 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kcalc-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kcalc-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kcalc.xpm b/ubuntu/_base/kdeutils/debian/icons/kcalc.xpm
index 99b79e585..99b79e585 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kcalc.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kcalc.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kcharselect-16.xpm b/ubuntu/_base/kdeutils/debian/icons/kcharselect-16.xpm
index 37eea509a..37eea509a 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kcharselect-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kcharselect-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kcharselect.xpm b/ubuntu/_base/kdeutils/debian/icons/kcharselect.xpm
index 4d3187509..4d3187509 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kcharselect.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kcharselect.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kdf-16.xpm b/ubuntu/_base/kdeutils/debian/icons/kdf-16.xpm
index e9f074b42..e9f074b42 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kdf-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kdf-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kdf.xpm b/ubuntu/_base/kdeutils/debian/icons/kdf.xpm
index b4c9d470a..b4c9d470a 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kdf.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kdf.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kedit-16.xpm b/ubuntu/_base/kdeutils/debian/icons/kedit-16.xpm
index d5d2e7cfb..d5d2e7cfb 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kedit-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kedit-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kedit.xpm b/ubuntu/_base/kdeutils/debian/icons/kedit.xpm
index 5f973d166..5f973d166 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kedit.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kedit.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kfloppy-16.xpm b/ubuntu/_base/kdeutils/debian/icons/kfloppy-16.xpm
index bfea0ec17..bfea0ec17 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kfloppy-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kfloppy-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kfloppy.xpm b/ubuntu/_base/kdeutils/debian/icons/kfloppy.xpm
index facf97162..facf97162 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kfloppy.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kfloppy.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kgpg-16.xpm b/ubuntu/_base/kdeutils/debian/icons/kgpg-16.xpm
index 7388264e5..7388264e5 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kgpg-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kgpg-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kgpg.xpm b/ubuntu/_base/kdeutils/debian/icons/kgpg.xpm
index 8f1a3dcf0..8f1a3dcf0 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kgpg.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kgpg.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/khexedit-16.xpm b/ubuntu/_base/kdeutils/debian/icons/khexedit-16.xpm
index d0134aa3e..d0134aa3e 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/khexedit-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/khexedit-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/khexedit.xpm b/ubuntu/_base/kdeutils/debian/icons/khexedit.xpm
index 06bd1a274..06bd1a274 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/khexedit.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/khexedit.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kjots-16.xpm b/ubuntu/_base/kdeutils/debian/icons/kjots-16.xpm
index a94206162..a94206162 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kjots-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kjots-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kjots.xpm b/ubuntu/_base/kdeutils/debian/icons/kjots.xpm
index ff080d32e..ff080d32e 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kjots.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kjots.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kregexpeditor-16.xpm b/ubuntu/_base/kdeutils/debian/icons/kregexpeditor-16.xpm
index bfd3d835d..bfd3d835d 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kregexpeditor-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kregexpeditor-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kregexpeditor.xpm b/ubuntu/_base/kdeutils/debian/icons/kregexpeditor.xpm
index a81cf60c6..a81cf60c6 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kregexpeditor.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kregexpeditor.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/ktimer-16.xpm b/ubuntu/_base/kdeutils/debian/icons/ktimer-16.xpm
index f0c857680..f0c857680 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/ktimer-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/ktimer-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/ktimer.xpm b/ubuntu/_base/kdeutils/debian/icons/ktimer.xpm
index 4f08fe0fc..4f08fe0fc 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/ktimer.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/ktimer.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kwikdisk-16.xpm b/ubuntu/_base/kdeutils/debian/icons/kwikdisk-16.xpm
index e861b0b34..e861b0b34 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kwikdisk-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kwikdisk-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/kwikdisk.xpm b/ubuntu/_base/kdeutils/debian/icons/kwikdisk.xpm
index 4521b420a..4521b420a 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/kwikdisk.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/kwikdisk.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/superkaramba-16.xpm b/ubuntu/_base/kdeutils/debian/icons/superkaramba-16.xpm
index edb9db936..edb9db936 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/superkaramba-16.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/superkaramba-16.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/icons/superkaramba.xpm b/ubuntu/_base/kdeutils/debian/icons/superkaramba.xpm
index c4f096556..c4f096556 100644
--- a/ubuntu/maverick/kdeutils/debian/icons/superkaramba.xpm
+++ b/ubuntu/_base/kdeutils/debian/icons/superkaramba.xpm
diff --git a/ubuntu/maverick/kdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/_base/kdeutils/debian/kcalc-trinity-trinity.lintian
index 4e3ff01ab..4e3ff01ab 100644
--- a/ubuntu/maverick/kdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/_base/kdeutils/debian/kcalc-trinity-trinity.lintian
diff --git a/ubuntu/maverick/kdeutils/debian/kcalc-trinity.install b/ubuntu/_base/kdeutils/debian/kcalc-trinity.install
index cf2881698..cf2881698 100644
--- a/ubuntu/maverick/kdeutils/debian/kcalc-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kcalc-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kcalc-trinity.manpages b/ubuntu/_base/kdeutils/debian/kcalc-trinity.manpages
index ee2f0ad0a..ee2f0ad0a 100644
--- a/ubuntu/maverick/kdeutils/debian/kcalc-trinity.manpages
+++ b/ubuntu/_base/kdeutils/debian/kcalc-trinity.manpages
diff --git a/ubuntu/maverick/kdeutils/debian/kcalc-trinity.menu b/ubuntu/_base/kdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..146e4b1fb 100644
--- a/ubuntu/maverick/kdeutils/debian/kcalc-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/kcalc-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/kcharselect-trinity.install b/ubuntu/_base/kdeutils/debian/kcharselect-trinity.install
index a18296be0..a18296be0 100644
--- a/ubuntu/maverick/kdeutils/debian/kcharselect-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kcharselect-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kcharselect-trinity.manpages b/ubuntu/_base/kdeutils/debian/kcharselect-trinity.manpages
index 6a1e28fb7..6a1e28fb7 100644
--- a/ubuntu/maverick/kdeutils/debian/kcharselect-trinity.manpages
+++ b/ubuntu/_base/kdeutils/debian/kcharselect-trinity.manpages
diff --git a/ubuntu/maverick/kdeutils/debian/kcharselect-trinity.menu b/ubuntu/_base/kdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..59a49f72d 100644
--- a/ubuntu/maverick/kdeutils/debian/kcharselect-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/kcharselect-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/kdelirc-trinity.install b/ubuntu/_base/kdeutils/debian/kdelirc-trinity.install
index a1ee8b7ed..a1ee8b7ed 100644
--- a/ubuntu/maverick/kdeutils/debian/kdelirc-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kdelirc-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kdelirc-trinity.lintian b/ubuntu/_base/kdeutils/debian/kdelirc-trinity.lintian
index 51b260d6a..51b260d6a 100644
--- a/ubuntu/maverick/kdeutils/debian/kdelirc-trinity.lintian
+++ b/ubuntu/_base/kdeutils/debian/kdelirc-trinity.lintian
diff --git a/ubuntu/maverick/kdeutils/debian/kdessh-trinity.install b/ubuntu/_base/kdeutils/debian/kdessh-trinity.install
index f5b56dd0d..f5b56dd0d 100644
--- a/ubuntu/maverick/kdeutils/debian/kdessh-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kdessh-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.ark b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.ark
index 0285ce94e..0285ce94e 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.ark
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.ark
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.irkick b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.irkick
index e5b1a6d9d..e5b1a6d9d 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.irkick
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.irkick
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc
index f99892cbe..f99892cbe 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kcalc
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc
index a359eecc2..a359eecc2 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kcmlirc
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kdf b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kdf
index 4d96a3307..4d96a3307 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kdf
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kdf
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kedit b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kedit
index f4d03d484..f4d03d484 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kedit
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kedit
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy
index 1d524873d..1d524873d 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kfloppy
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg
index 686a275a3..686a275a3 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kgpg
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit
index f30866d09..f30866d09 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.khexedit
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kjots b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kjots
index 2813b5727..2813b5727 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kjots
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kjots
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor
index 80ff56094..80ff56094 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kregexpeditor
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet
index e83203abd..e83203abd 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.kwallet
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba
index 1b20e103b..1b20e103b 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-doc-html.doc-base.superkaramba
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-trinity-dev.install b/ubuntu/_base/kdeutils/debian/kdeutils-trinity-dev.install
index 4ac477602..4ac477602 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-trinity-dev.install
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-trinity-dev.install
diff --git a/ubuntu/maverick/kdeutils/debian/kdeutils-trinity-doc.install b/ubuntu/_base/kdeutils/debian/kdeutils-trinity-doc.install
index 290c9ebe8..290c9ebe8 100644
--- a/ubuntu/maverick/kdeutils/debian/kdeutils-trinity-doc.install
+++ b/ubuntu/_base/kdeutils/debian/kdeutils-trinity-doc.install
diff --git a/ubuntu/maverick/kdeutils/debian/kdf-trinity.install b/ubuntu/_base/kdeutils/debian/kdf-trinity.install
index 074e2f7f8..074e2f7f8 100644
--- a/ubuntu/maverick/kdeutils/debian/kdf-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kdf-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kdf-trinity.manpages b/ubuntu/_base/kdeutils/debian/kdf-trinity.manpages
index ac5e86975..ac5e86975 100644
--- a/ubuntu/maverick/kdeutils/debian/kdf-trinity.manpages
+++ b/ubuntu/_base/kdeutils/debian/kdf-trinity.manpages
diff --git a/ubuntu/maverick/kdeutils/debian/kdf-trinity.menu b/ubuntu/_base/kdeutils/debian/kdf-trinity.menu
index 7edf7e1c1..7edf7e1c1 100644
--- a/ubuntu/maverick/kdeutils/debian/kdf-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/kdf-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/kedit-trinity.install b/ubuntu/_base/kdeutils/debian/kedit-trinity.install
index e17c3fb17..e17c3fb17 100644
--- a/ubuntu/maverick/kdeutils/debian/kedit-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kedit-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kedit-trinity.lintian b/ubuntu/_base/kdeutils/debian/kedit-trinity.lintian
index 232253503..232253503 100644
--- a/ubuntu/maverick/kdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/_base/kdeutils/debian/kedit-trinity.lintian
diff --git a/ubuntu/maverick/kdeutils/debian/kedit-trinity.manpages b/ubuntu/_base/kdeutils/debian/kedit-trinity.manpages
index 84374715a..84374715a 100644
--- a/ubuntu/maverick/kdeutils/debian/kedit-trinity.manpages
+++ b/ubuntu/_base/kdeutils/debian/kedit-trinity.manpages
diff --git a/ubuntu/maverick/kdeutils/debian/kedit-trinity.menu b/ubuntu/_base/kdeutils/debian/kedit-trinity.menu
index a22b486b0..a22b486b0 100644
--- a/ubuntu/maverick/kdeutils/debian/kedit-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/kedit-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/kedit-trinity.mime b/ubuntu/_base/kdeutils/debian/kedit-trinity.mime
index 966a4bb90..966a4bb90 100644
--- a/ubuntu/maverick/kdeutils/debian/kedit-trinity.mime
+++ b/ubuntu/_base/kdeutils/debian/kedit-trinity.mime
diff --git a/ubuntu/maverick/kdeutils/debian/kfloppy-trinity.install b/ubuntu/_base/kdeutils/debian/kfloppy-trinity.install
index 25738bfa0..25738bfa0 100644
--- a/ubuntu/maverick/kdeutils/debian/kfloppy-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kfloppy-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kfloppy-trinity.manpages b/ubuntu/_base/kdeutils/debian/kfloppy-trinity.manpages
index 02c1ea86f..02c1ea86f 100644
--- a/ubuntu/maverick/kdeutils/debian/kfloppy-trinity.manpages
+++ b/ubuntu/_base/kdeutils/debian/kfloppy-trinity.manpages
diff --git a/ubuntu/maverick/kdeutils/debian/kfloppy-trinity.menu b/ubuntu/_base/kdeutils/debian/kfloppy-trinity.menu
index 33faffe31..33faffe31 100644
--- a/ubuntu/maverick/kdeutils/debian/kfloppy-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/kfloppy-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/kgpg-trinity.install b/ubuntu/_base/kdeutils/debian/kgpg-trinity.install
index 26605d453..26605d453 100644
--- a/ubuntu/maverick/kdeutils/debian/kgpg-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kgpg-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kgpg-trinity.manpages b/ubuntu/_base/kdeutils/debian/kgpg-trinity.manpages
index 111b73663..111b73663 100644
--- a/ubuntu/maverick/kdeutils/debian/kgpg-trinity.manpages
+++ b/ubuntu/_base/kdeutils/debian/kgpg-trinity.manpages
diff --git a/ubuntu/maverick/kdeutils/debian/kgpg-trinity.menu b/ubuntu/_base/kdeutils/debian/kgpg-trinity.menu
index 533bb9117..533bb9117 100644
--- a/ubuntu/maverick/kdeutils/debian/kgpg-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/kgpg-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/khexedit-trinity.install b/ubuntu/_base/kdeutils/debian/khexedit-trinity.install
index d48280fed..d48280fed 100644
--- a/ubuntu/maverick/kdeutils/debian/khexedit-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/khexedit-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/khexedit-trinity.manpages b/ubuntu/_base/kdeutils/debian/khexedit-trinity.manpages
index 41235ebfd..41235ebfd 100644
--- a/ubuntu/maverick/kdeutils/debian/khexedit-trinity.manpages
+++ b/ubuntu/_base/kdeutils/debian/khexedit-trinity.manpages
diff --git a/ubuntu/maverick/kdeutils/debian/khexedit-trinity.menu b/ubuntu/_base/kdeutils/debian/khexedit-trinity.menu
index 7e75828dc..7e75828dc 100644
--- a/ubuntu/maverick/kdeutils/debian/khexedit-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/khexedit-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/kjots-trinity.install b/ubuntu/_base/kdeutils/debian/kjots-trinity.install
index 8b117e0b5..8b117e0b5 100644
--- a/ubuntu/maverick/kdeutils/debian/kjots-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kjots-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kjots-trinity.menu b/ubuntu/_base/kdeutils/debian/kjots-trinity.menu
index c303fa2f4..c303fa2f4 100644
--- a/ubuntu/maverick/kdeutils/debian/kjots-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/kjots-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/klaptopdaemon-trinity.install b/ubuntu/_base/kdeutils/debian/klaptopdaemon-trinity.install
index 3e9d1af18..3e9d1af18 100644
--- a/ubuntu/maverick/kdeutils/debian/klaptopdaemon-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/klaptopdaemon-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/klaptopdaemon-trinity.prerm b/ubuntu/_base/kdeutils/debian/klaptopdaemon-trinity.prerm
index ecc9ea389..ecc9ea389 100644
--- a/ubuntu/maverick/kdeutils/debian/klaptopdaemon-trinity.prerm
+++ b/ubuntu/_base/kdeutils/debian/klaptopdaemon-trinity.prerm
diff --git a/ubuntu/maverick/kdeutils/debian/klaptopdaemon.README.Debian b/ubuntu/_base/kdeutils/debian/klaptopdaemon.README.Debian
index d6cf29558..d6cf29558 100644
--- a/ubuntu/maverick/kdeutils/debian/klaptopdaemon.README.Debian
+++ b/ubuntu/_base/kdeutils/debian/klaptopdaemon.README.Debian
diff --git a/ubuntu/maverick/kdeutils/debian/kmilo-legacy-trinity.install b/ubuntu/_base/kdeutils/debian/kmilo-legacy-trinity.install
index 9cc04b20c..9cc04b20c 100644
--- a/ubuntu/maverick/kdeutils/debian/kmilo-legacy-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kmilo-legacy-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kmilo-trinity.install b/ubuntu/_base/kdeutils/debian/kmilo-trinity.install
index 1d5b8cb8f..1d5b8cb8f 100644
--- a/ubuntu/maverick/kdeutils/debian/kmilo-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kmilo-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kregexpeditor-trinity.install b/ubuntu/_base/kdeutils/debian/kregexpeditor-trinity.install
index ddb0d489f..ddb0d489f 100644
--- a/ubuntu/maverick/kdeutils/debian/kregexpeditor-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kregexpeditor-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/kregexpeditor-trinity.menu b/ubuntu/_base/kdeutils/debian/kregexpeditor-trinity.menu
index 3c95d33ec..3c95d33ec 100644
--- a/ubuntu/maverick/kdeutils/debian/kregexpeditor-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/kregexpeditor-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/ksim-trinity.install b/ubuntu/_base/kdeutils/debian/ksim-trinity.install
index c1d00aefc..c1d00aefc 100644
--- a/ubuntu/maverick/kdeutils/debian/ksim-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/ksim-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/ksim-trinity.preinst b/ubuntu/_base/kdeutils/debian/ksim-trinity.preinst
index 71c296dca..71c296dca 100644
--- a/ubuntu/maverick/kdeutils/debian/ksim-trinity.preinst
+++ b/ubuntu/_base/kdeutils/debian/ksim-trinity.preinst
diff --git a/ubuntu/maverick/kdeutils/debian/ktimer-trinity.install b/ubuntu/_base/kdeutils/debian/ktimer-trinity.install
index abebef83d..abebef83d 100644
--- a/ubuntu/maverick/kdeutils/debian/ktimer-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/ktimer-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/ktimer-trinity.menu b/ubuntu/_base/kdeutils/debian/ktimer-trinity.menu
index f120b78df..f120b78df 100644
--- a/ubuntu/maverick/kdeutils/debian/ktimer-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/ktimer-trinity.menu
diff --git a/ubuntu/maverick/kdeutils/debian/kwalletmanager-trinity.install b/ubuntu/_base/kdeutils/debian/kwalletmanager-trinity.install
index 250eb2390..250eb2390 100644
--- a/ubuntu/maverick/kdeutils/debian/kwalletmanager-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/kwalletmanager-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/man/ark-trinity.1 b/ubuntu/_base/kdeutils/debian/man/ark-trinity.1
index f15b77b33..f15b77b33 100644
--- a/ubuntu/maverick/kdeutils/debian/man/ark-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/ark-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/man/kcalc-trinity.1 b/ubuntu/_base/kdeutils/debian/man/kcalc-trinity.1
index d84088327..d84088327 100644
--- a/ubuntu/maverick/kdeutils/debian/man/kcalc-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/kcalc-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/man/kcharselect-trinity.1 b/ubuntu/_base/kdeutils/debian/man/kcharselect-trinity.1
index bc0fb442b..bc0fb442b 100644
--- a/ubuntu/maverick/kdeutils/debian/man/kcharselect-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/kcharselect-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/man/kdf-trinity.1 b/ubuntu/_base/kdeutils/debian/man/kdf-trinity.1
index 50cabade4..50cabade4 100644
--- a/ubuntu/maverick/kdeutils/debian/man/kdf-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/kdf-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/man/kedit-trinity.1 b/ubuntu/_base/kdeutils/debian/man/kedit-trinity.1
index 26dafcbbd..26dafcbbd 100644
--- a/ubuntu/maverick/kdeutils/debian/man/kedit-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/kedit-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/man/kfloppy-trinity.1 b/ubuntu/_base/kdeutils/debian/man/kfloppy-trinity.1
index b2b26a248..b2b26a248 100644
--- a/ubuntu/maverick/kdeutils/debian/man/kfloppy-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/kfloppy-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/man/kgpg-trinity.1 b/ubuntu/_base/kdeutils/debian/man/kgpg-trinity.1
index 113143963..113143963 100644
--- a/ubuntu/maverick/kdeutils/debian/man/kgpg-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/kgpg-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/man/khexedit-trinity.1 b/ubuntu/_base/kdeutils/debian/man/khexedit-trinity.1
index c77a34699..c77a34699 100644
--- a/ubuntu/maverick/kdeutils/debian/man/khexedit-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/khexedit-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/man/kwikdisk-trinity.1 b/ubuntu/_base/kdeutils/debian/man/kwikdisk-trinity.1
index 15e727db6..15e727db6 100644
--- a/ubuntu/maverick/kdeutils/debian/man/kwikdisk-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/kwikdisk-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/man/superkaramba-trinity.1 b/ubuntu/_base/kdeutils/debian/man/superkaramba-trinity.1
index 134761ea5..134761ea5 100644
--- a/ubuntu/maverick/kdeutils/debian/man/superkaramba-trinity.1
+++ b/ubuntu/_base/kdeutils/debian/man/superkaramba-trinity.1
diff --git a/ubuntu/maverick/kdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/ubuntu/_base/kdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
index 485164ebe..485164ebe 100644
--- a/ubuntu/maverick/kdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
+++ b/ubuntu/_base/kdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
diff --git a/ubuntu/maverick/kdeutils/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdeutils/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdeutils/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdeutils/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdeutils/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdeutils/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdeutils/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdeutils/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdeutils/debian/patches/series b/ubuntu/_base/kdeutils/debian/patches/series
index f4421a4c2..f4421a4c2 100644
--- a/ubuntu/maverick/kdeutils/debian/patches/series
+++ b/ubuntu/_base/kdeutils/debian/patches/series
diff --git a/ubuntu/maverick/kdeutils/debian/rules b/ubuntu/_base/kdeutils/debian/rules
index cdb529f2e..cdb529f2e 100755
--- a/ubuntu/maverick/kdeutils/debian/rules
+++ b/ubuntu/_base/kdeutils/debian/rules
diff --git a/ubuntu/maverick/kdeutils/debian/source/format b/ubuntu/_base/kdeutils/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdeutils/debian/source/format
+++ b/ubuntu/_base/kdeutils/debian/source/format
diff --git a/ubuntu/maverick/kdeutils/debian/source/options b/ubuntu/_base/kdeutils/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdeutils/debian/source/options
+++ b/ubuntu/_base/kdeutils/debian/source/options
diff --git a/ubuntu/maverick/kdeutils/debian/superkaramba-trinity.examples b/ubuntu/_base/kdeutils/debian/superkaramba-trinity.examples
index c02a032d2..c02a032d2 100644
--- a/ubuntu/maverick/kdeutils/debian/superkaramba-trinity.examples
+++ b/ubuntu/_base/kdeutils/debian/superkaramba-trinity.examples
diff --git a/ubuntu/maverick/kdeutils/debian/superkaramba-trinity.install b/ubuntu/_base/kdeutils/debian/superkaramba-trinity.install
index 12daea5ba..12daea5ba 100644
--- a/ubuntu/maverick/kdeutils/debian/superkaramba-trinity.install
+++ b/ubuntu/_base/kdeutils/debian/superkaramba-trinity.install
diff --git a/ubuntu/maverick/kdeutils/debian/superkaramba-trinity.manpages b/ubuntu/_base/kdeutils/debian/superkaramba-trinity.manpages
index 730ac7f62..730ac7f62 100644
--- a/ubuntu/maverick/kdeutils/debian/superkaramba-trinity.manpages
+++ b/ubuntu/_base/kdeutils/debian/superkaramba-trinity.manpages
diff --git a/ubuntu/maverick/kdeutils/debian/superkaramba-trinity.menu b/ubuntu/_base/kdeutils/debian/superkaramba-trinity.menu
index 1a03b78dd..1a03b78dd 100644
--- a/ubuntu/maverick/kdeutils/debian/superkaramba-trinity.menu
+++ b/ubuntu/_base/kdeutils/debian/superkaramba-trinity.menu
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/README.Debian b/ubuntu/_base/kdevelop.cmake/debian/README.Debian
index ca17bc626..ca17bc626 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/README.Debian
+++ b/ubuntu/_base/kdevelop.cmake/debian/README.Debian
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk b/ubuntu/_base/kdevelop.cmake/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdevelop.cmake/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/versions.pl b/ubuntu/_base/kdevelop.cmake/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdevelop.cmake/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/changelog b/ubuntu/_base/kdevelop.cmake/debian/changelog
index d37ad0e8d..d37ad0e8d 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/changelog
+++ b/ubuntu/_base/kdevelop.cmake/debian/changelog
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/compat b/ubuntu/_base/kdevelop.cmake/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/compat
+++ b/ubuntu/_base/kdevelop.cmake/debian/compat
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/control b/ubuntu/_base/kdevelop.cmake/debian/control
index 9dee449b0..9dee449b0 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/control
+++ b/ubuntu/_base/kdevelop.cmake/debian/control
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/copyright b/ubuntu/_base/kdevelop.cmake/debian/copyright
index d967b6c07..d967b6c07 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/copyright
+++ b/ubuntu/_base/kdevelop.cmake/debian/copyright
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-data-trinity.install b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-data-trinity.install
index 70e2f0ebc..70e2f0ebc 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-data-trinity.install
+++ b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-data-trinity.install
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-data-trinity.lintian b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-data-trinity.lintian
index 7fae2cfa6..7fae2cfa6 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-data-trinity.lintian
+++ b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-data-trinity.lintian
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-dev.install b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity-dev.install
index 5c24ba5bb..5c24ba5bb 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-dev.install
+++ b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity-dev.install
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-doc.install b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity-doc.install
index 8d78fbd5e..8d78fbd5e 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-doc.install
+++ b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity-doc.install
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.install b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity.install
index 0c92940b2..0c92940b2 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.install
+++ b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity.install
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.manpages b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity.manpages
index b5d676453..b5d676453 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.manpages
+++ b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity.manpages
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.menu b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity.menu
index 7f40efdc4..7f40efdc4 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.menu
+++ b/ubuntu/_base/kdevelop.cmake/debian/kdevelop-trinity.menu
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop.xpm b/ubuntu/_base/kdevelop.cmake/debian/kdevelop.xpm
index 348a95692..348a95692 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop.xpm
+++ b/ubuntu/_base/kdevelop.cmake/debian/kdevelop.xpm
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/man/kdeopt.part b/ubuntu/_base/kdevelop.cmake/debian/man/kdeopt.part
index d258f0ad1..d258f0ad1 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/man/kdeopt.part
+++ b/ubuntu/_base/kdevelop.cmake/debian/man/kdeopt.part
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevassistant.man b/ubuntu/_base/kdevelop.cmake/debian/man/kdevassistant.man
index 7eadfe937..7eadfe937 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevassistant.man
+++ b/ubuntu/_base/kdevelop.cmake/debian/man/kdevassistant.man
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevdesigner.man b/ubuntu/_base/kdevelop.cmake/debian/man/kdevdesigner.man
index e200ff117..e200ff117 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevdesigner.man
+++ b/ubuntu/_base/kdevelop.cmake/debian/man/kdevdesigner.man
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevelop-htdig.man b/ubuntu/_base/kdevelop.cmake/debian/man/kdevelop-htdig.man
index b917bdcdf..b917bdcdf 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevelop-htdig.man
+++ b/ubuntu/_base/kdevelop.cmake/debian/man/kdevelop-htdig.man
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevelop.man b/ubuntu/_base/kdevelop.cmake/debian/man/kdevelop.man
index dc54b591c..dc54b591c 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevelop.man
+++ b/ubuntu/_base/kdevelop.cmake/debian/man/kdevelop.man
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevprj2kdevelop.man b/ubuntu/_base/kdevelop.cmake/debian/man/kdevprj2kdevelop.man
index 1a499963d..1a499963d 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevprj2kdevelop.man
+++ b/ubuntu/_base/kdevelop.cmake/debian/man/kdevprj2kdevelop.man
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevprofileeditor.man b/ubuntu/_base/kdevelop.cmake/debian/man/kdevprofileeditor.man
index 40e8692e7..40e8692e7 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/man/kdevprofileeditor.man
+++ b/ubuntu/_base/kdevelop.cmake/debian/man/kdevprofileeditor.man
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/patches/series b/ubuntu/_base/kdevelop.cmake/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/patches/series
+++ b/ubuntu/_base/kdevelop.cmake/debian/patches/series
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/rules b/ubuntu/_base/kdevelop.cmake/debian/rules
index 70c9d4488..70c9d4488 100755
--- a/ubuntu/maverick/kdevelop.cmake/debian/rules
+++ b/ubuntu/_base/kdevelop.cmake/debian/rules
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/source.lintian-overrides b/ubuntu/_base/kdevelop.cmake/debian/source.lintian-overrides
index f74fddc6e..f74fddc6e 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/source.lintian-overrides
+++ b/ubuntu/_base/kdevelop.cmake/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/source/format b/ubuntu/_base/kdevelop.cmake/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/source/format
+++ b/ubuntu/_base/kdevelop.cmake/debian/source/format
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/source/options b/ubuntu/_base/kdevelop.cmake/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/source/options
+++ b/ubuntu/_base/kdevelop.cmake/debian/source/options
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/watch b/ubuntu/_base/kdevelop.cmake/debian/watch
index bbf94d39c..bbf94d39c 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/watch
+++ b/ubuntu/_base/kdevelop.cmake/debian/watch
diff --git a/ubuntu/maverick/kdevelop/debian/README.Debian b/ubuntu/_base/kdevelop/debian/README.Debian
index ca17bc626..ca17bc626 100644
--- a/ubuntu/maverick/kdevelop/debian/README.Debian
+++ b/ubuntu/_base/kdevelop/debian/README.Debian
diff --git a/ubuntu/maverick/kdevelop/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdevelop/debian/cdbs/debian-qt-kde.mk
index fdd089fd4..fdd089fd4 100644
--- a/ubuntu/maverick/kdevelop/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdevelop/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdevelop/debian/cdbs/kde.mk b/ubuntu/_base/kdevelop/debian/cdbs/kde.mk
index 80176d63e..80176d63e 100644
--- a/ubuntu/maverick/kdevelop/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdevelop/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdevelop/debian/cdbs/versions.pl b/ubuntu/_base/kdevelop/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdevelop/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdevelop/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdevelop/debian/changelog b/ubuntu/_base/kdevelop/debian/changelog
index d37ad0e8d..d37ad0e8d 100644
--- a/ubuntu/maverick/kdevelop/debian/changelog
+++ b/ubuntu/_base/kdevelop/debian/changelog
diff --git a/ubuntu/maverick/kdevelop/debian/compat b/ubuntu/_base/kdevelop/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdevelop/debian/compat
+++ b/ubuntu/_base/kdevelop/debian/compat
diff --git a/ubuntu/maverick/kdevelop/debian/control b/ubuntu/_base/kdevelop/debian/control
index 81c5e5ddc..81c5e5ddc 100644
--- a/ubuntu/maverick/kdevelop/debian/control
+++ b/ubuntu/_base/kdevelop/debian/control
diff --git a/ubuntu/maverick/kdevelop/debian/copyright b/ubuntu/_base/kdevelop/debian/copyright
index d967b6c07..d967b6c07 100644
--- a/ubuntu/maverick/kdevelop/debian/copyright
+++ b/ubuntu/_base/kdevelop/debian/copyright
diff --git a/ubuntu/maverick/kdevelop/debian/kdevelop-data-trinity.install b/ubuntu/_base/kdevelop/debian/kdevelop-data-trinity.install
index 70e2f0ebc..70e2f0ebc 100644
--- a/ubuntu/maverick/kdevelop/debian/kdevelop-data-trinity.install
+++ b/ubuntu/_base/kdevelop/debian/kdevelop-data-trinity.install
diff --git a/ubuntu/maverick/kdevelop/debian/kdevelop-data-trinity.lintian b/ubuntu/_base/kdevelop/debian/kdevelop-data-trinity.lintian
index a78623689..a78623689 100644
--- a/ubuntu/maverick/kdevelop/debian/kdevelop-data-trinity.lintian
+++ b/ubuntu/_base/kdevelop/debian/kdevelop-data-trinity.lintian
diff --git a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity-dev.install b/ubuntu/_base/kdevelop/debian/kdevelop-trinity-dev.install
index a8813a5e2..a8813a5e2 100644
--- a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity-dev.install
+++ b/ubuntu/_base/kdevelop/debian/kdevelop-trinity-dev.install
diff --git a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity-doc.install b/ubuntu/_base/kdevelop/debian/kdevelop-trinity-doc.install
index 09ea4d8b8..09ea4d8b8 100644
--- a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity-doc.install
+++ b/ubuntu/_base/kdevelop/debian/kdevelop-trinity-doc.install
diff --git a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity.install b/ubuntu/_base/kdevelop/debian/kdevelop-trinity.install
index 0c92940b2..0c92940b2 100644
--- a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity.install
+++ b/ubuntu/_base/kdevelop/debian/kdevelop-trinity.install
diff --git a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity.manpages b/ubuntu/_base/kdevelop/debian/kdevelop-trinity.manpages
index b5d676453..b5d676453 100644
--- a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity.manpages
+++ b/ubuntu/_base/kdevelop/debian/kdevelop-trinity.manpages
diff --git a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity.menu b/ubuntu/_base/kdevelop/debian/kdevelop-trinity.menu
index 7f40efdc4..7f40efdc4 100644
--- a/ubuntu/maverick/kdevelop/debian/kdevelop-trinity.menu
+++ b/ubuntu/_base/kdevelop/debian/kdevelop-trinity.menu
diff --git a/ubuntu/maverick/kdevelop/debian/kdevelop.xpm b/ubuntu/_base/kdevelop/debian/kdevelop.xpm
index 348a95692..348a95692 100644
--- a/ubuntu/maverick/kdevelop/debian/kdevelop.xpm
+++ b/ubuntu/_base/kdevelop/debian/kdevelop.xpm
diff --git a/ubuntu/maverick/kdevelop/debian/man/kdeopt.part b/ubuntu/_base/kdevelop/debian/man/kdeopt.part
index d258f0ad1..d258f0ad1 100644
--- a/ubuntu/maverick/kdevelop/debian/man/kdeopt.part
+++ b/ubuntu/_base/kdevelop/debian/man/kdeopt.part
diff --git a/ubuntu/maverick/kdevelop/debian/man/kdevassistant.man b/ubuntu/_base/kdevelop/debian/man/kdevassistant.man
index 7eadfe937..7eadfe937 100644
--- a/ubuntu/maverick/kdevelop/debian/man/kdevassistant.man
+++ b/ubuntu/_base/kdevelop/debian/man/kdevassistant.man
diff --git a/ubuntu/maverick/kdevelop/debian/man/kdevdesigner.man b/ubuntu/_base/kdevelop/debian/man/kdevdesigner.man
index e200ff117..e200ff117 100644
--- a/ubuntu/maverick/kdevelop/debian/man/kdevdesigner.man
+++ b/ubuntu/_base/kdevelop/debian/man/kdevdesigner.man
diff --git a/ubuntu/maverick/kdevelop/debian/man/kdevelop-htdig.man b/ubuntu/_base/kdevelop/debian/man/kdevelop-htdig.man
index b917bdcdf..b917bdcdf 100644
--- a/ubuntu/maverick/kdevelop/debian/man/kdevelop-htdig.man
+++ b/ubuntu/_base/kdevelop/debian/man/kdevelop-htdig.man
diff --git a/ubuntu/maverick/kdevelop/debian/man/kdevelop.man b/ubuntu/_base/kdevelop/debian/man/kdevelop.man
index dc54b591c..dc54b591c 100644
--- a/ubuntu/maverick/kdevelop/debian/man/kdevelop.man
+++ b/ubuntu/_base/kdevelop/debian/man/kdevelop.man
diff --git a/ubuntu/maverick/kdevelop/debian/man/kdevprj2kdevelop.man b/ubuntu/_base/kdevelop/debian/man/kdevprj2kdevelop.man
index 1a499963d..1a499963d 100644
--- a/ubuntu/maverick/kdevelop/debian/man/kdevprj2kdevelop.man
+++ b/ubuntu/_base/kdevelop/debian/man/kdevprj2kdevelop.man
diff --git a/ubuntu/maverick/kdevelop/debian/man/kdevprofileeditor.man b/ubuntu/_base/kdevelop/debian/man/kdevprofileeditor.man
index 40e8692e7..40e8692e7 100644
--- a/ubuntu/maverick/kdevelop/debian/man/kdevprofileeditor.man
+++ b/ubuntu/_base/kdevelop/debian/man/kdevprofileeditor.man
diff --git a/ubuntu/maverick/kdevelop/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/kdevelop/debian/patches/common/04_am_maintainer_mode.diff
index 391a80285..391a80285 100644
--- a/ubuntu/maverick/kdevelop/debian/patches/common/04_am_maintainer_mode.diff
+++ b/ubuntu/_base/kdevelop/debian/patches/common/04_am_maintainer_mode.diff
diff --git a/ubuntu/maverick/kdevelop/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/kdevelop/debian/patches/common/06_disable_no_undefined.diff
index 05c932c3c..05c932c3c 100644
--- a/ubuntu/maverick/kdevelop/debian/patches/common/06_disable_no_undefined.diff
+++ b/ubuntu/_base/kdevelop/debian/patches/common/06_disable_no_undefined.diff
diff --git a/ubuntu/maverick/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..0caf5361a 100644
--- a/ubuntu/maverick/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdevelop/debian/patches/series b/ubuntu/_base/kdevelop/debian/patches/series
index 6b3ddc8ec..6b3ddc8ec 100644
--- a/ubuntu/maverick/kdevelop/debian/patches/series
+++ b/ubuntu/_base/kdevelop/debian/patches/series
diff --git a/ubuntu/maverick/kdevelop/debian/rules b/ubuntu/_base/kdevelop/debian/rules
index 38fbd86d7..38fbd86d7 100755
--- a/ubuntu/maverick/kdevelop/debian/rules
+++ b/ubuntu/_base/kdevelop/debian/rules
diff --git a/ubuntu/maverick/kdevelop/debian/source.lintian-overrides b/ubuntu/_base/kdevelop/debian/source.lintian-overrides
index f74fddc6e..f74fddc6e 100644
--- a/ubuntu/maverick/kdevelop/debian/source.lintian-overrides
+++ b/ubuntu/_base/kdevelop/debian/source.lintian-overrides
diff --git a/ubuntu/maverick/kdevelop/debian/source/format b/ubuntu/_base/kdevelop/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdevelop/debian/source/format
+++ b/ubuntu/_base/kdevelop/debian/source/format
diff --git a/ubuntu/maverick/kdevelop/debian/source/options b/ubuntu/_base/kdevelop/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdevelop/debian/source/options
+++ b/ubuntu/_base/kdevelop/debian/source/options
diff --git a/ubuntu/maverick/kdevelop/debian/watch b/ubuntu/_base/kdevelop/debian/watch
index bbf94d39c..bbf94d39c 100644
--- a/ubuntu/maverick/kdevelop/debian/watch
+++ b/ubuntu/_base/kdevelop/debian/watch
diff --git a/ubuntu/maverick/kdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/kdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
index a81b1de92..a81b1de92 100644
--- a/ubuntu/maverick/kdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/kdewebdev/debian/KUBUNTU-DEBIAN-DIFFERENCES
diff --git a/ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/kdewebdev/debian/cdbs/debian-qt-kde.mk
index 5167c26a3..5167c26a3 100644
--- a/ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/kdewebdev/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/kdewebdev/debian/cdbs/kde.mk b/ubuntu/_base/kdewebdev/debian/cdbs/kde.mk
index e47e24f8c..e47e24f8c 100644
--- a/ubuntu/maverick/kdewebdev/debian/cdbs/kde.mk
+++ b/ubuntu/_base/kdewebdev/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/kdewebdev/debian/cdbs/versions.pl b/ubuntu/_base/kdewebdev/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/kdewebdev/debian/cdbs/versions.pl
+++ b/ubuntu/_base/kdewebdev/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/kdewebdev/debian/changelog b/ubuntu/_base/kdewebdev/debian/changelog
index c7032ecda..c7032ecda 100644
--- a/ubuntu/maverick/kdewebdev/debian/changelog
+++ b/ubuntu/_base/kdewebdev/debian/changelog
diff --git a/ubuntu/maverick/kdewebdev/debian/compat b/ubuntu/_base/kdewebdev/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/kdewebdev/debian/compat
+++ b/ubuntu/_base/kdewebdev/debian/compat
diff --git a/ubuntu/maverick/kdewebdev/debian/control b/ubuntu/_base/kdewebdev/debian/control
index cd59cdf75..cd59cdf75 100644
--- a/ubuntu/maverick/kdewebdev/debian/control
+++ b/ubuntu/_base/kdewebdev/debian/control
diff --git a/ubuntu/maverick/kdewebdev/debian/copyright b/ubuntu/_base/kdewebdev/debian/copyright
index f0f4e2f07..f0f4e2f07 100644
--- a/ubuntu/maverick/kdewebdev/debian/copyright
+++ b/ubuntu/_base/kdewebdev/debian/copyright
diff --git a/ubuntu/maverick/kdewebdev/debian/docrc/css.docrc b/ubuntu/_base/kdewebdev/debian/docrc/css.docrc
index c5c04681f..c5c04681f 100644
--- a/ubuntu/maverick/kdewebdev/debian/docrc/css.docrc
+++ b/ubuntu/_base/kdewebdev/debian/docrc/css.docrc
diff --git a/ubuntu/maverick/kdewebdev/debian/docrc/docbook.docrc b/ubuntu/_base/kdewebdev/debian/docrc/docbook.docrc
index 41a1a6c3b..41a1a6c3b 100644
--- a/ubuntu/maverick/kdewebdev/debian/docrc/docbook.docrc
+++ b/ubuntu/_base/kdewebdev/debian/docrc/docbook.docrc
diff --git a/ubuntu/maverick/kdewebdev/debian/docrc/html.docrc b/ubuntu/_base/kdewebdev/debian/docrc/html.docrc
index f0d051751..f0d051751 100644
--- a/ubuntu/maverick/kdewebdev/debian/docrc/html.docrc
+++ b/ubuntu/_base/kdewebdev/debian/docrc/html.docrc
diff --git a/ubuntu/maverick/kdewebdev/debian/docrc/php.docrc b/ubuntu/_base/kdewebdev/debian/docrc/php.docrc
index db48827d4..db48827d4 100644
--- a/ubuntu/maverick/kdewebdev/debian/docrc/php.docrc
+++ b/ubuntu/_base/kdewebdev/debian/docrc/php.docrc
diff --git a/ubuntu/maverick/kdewebdev/debian/icons/kimagemapeditor.xpm b/ubuntu/_base/kdewebdev/debian/icons/kimagemapeditor.xpm
index 8a24150d2..8a24150d2 100644
--- a/ubuntu/maverick/kdewebdev/debian/icons/kimagemapeditor.xpm
+++ b/ubuntu/_base/kdewebdev/debian/icons/kimagemapeditor.xpm
diff --git a/ubuntu/maverick/kdewebdev/debian/icons/klinkstatus.xpm b/ubuntu/_base/kdewebdev/debian/icons/klinkstatus.xpm
index 8f17fbf3d..8f17fbf3d 100644
--- a/ubuntu/maverick/kdewebdev/debian/icons/klinkstatus.xpm
+++ b/ubuntu/_base/kdewebdev/debian/icons/klinkstatus.xpm
diff --git a/ubuntu/maverick/kdewebdev/debian/icons/quanta.xpm b/ubuntu/_base/kdewebdev/debian/icons/quanta.xpm
index 659a3ff99..659a3ff99 100644
--- a/ubuntu/maverick/kdewebdev/debian/icons/quanta.xpm
+++ b/ubuntu/_base/kdewebdev/debian/icons/quanta.xpm
diff --git a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace
index 8e685ddea..8e685ddea 100644
--- a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace
+++ b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kfilereplace
diff --git a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus
index 4fbf65d44..4fbf65d44 100644
--- a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus
+++ b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.klinkstatus
diff --git a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander
index 233657324..233657324 100644
--- a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander
+++ b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kommander
diff --git a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg
index 2f14db1f4..2f14db1f4 100644
--- a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg
+++ b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.kxsldbg
diff --git a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta
index 6d8e92956..6d8e92956 100644
--- a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta
+++ b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.quanta
diff --git a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg
index e4147f24f..e4147f24f 100644
--- a/ubuntu/maverick/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg
+++ b/ubuntu/_base/kdewebdev/debian/kdewebdev-doc-html.doc-base.xsldbg
diff --git a/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.README.Debian b/ubuntu/_base/kdewebdev/debian/kfilereplace-trinity.README.Debian
index 3d186fbcf..3d186fbcf 100644
--- a/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.README.Debian
+++ b/ubuntu/_base/kdewebdev/debian/kfilereplace-trinity.README.Debian
diff --git a/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.install b/ubuntu/_base/kdewebdev/debian/kfilereplace-trinity.install
index 368c9640b..368c9640b 100644
--- a/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.install
+++ b/ubuntu/_base/kdewebdev/debian/kfilereplace-trinity.install
diff --git a/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.manpages b/ubuntu/_base/kdewebdev/debian/kfilereplace-trinity.manpages
index cf8df22a1..cf8df22a1 100644
--- a/ubuntu/maverick/kdewebdev/debian/kfilereplace-trinity.manpages
+++ b/ubuntu/_base/kdewebdev/debian/kfilereplace-trinity.manpages
diff --git a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.docs b/ubuntu/_base/kdewebdev/debian/kimagemapeditor-trinity.docs
index fcf97a3eb..fcf97a3eb 100644
--- a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.docs
+++ b/ubuntu/_base/kdewebdev/debian/kimagemapeditor-trinity.docs
diff --git a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.install b/ubuntu/_base/kdewebdev/debian/kimagemapeditor-trinity.install
index 62dfdcceb..62dfdcceb 100644
--- a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.install
+++ b/ubuntu/_base/kdewebdev/debian/kimagemapeditor-trinity.install
diff --git a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.manpages b/ubuntu/_base/kdewebdev/debian/kimagemapeditor-trinity.manpages
index e9fdcdb20..e9fdcdb20 100644
--- a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.manpages
+++ b/ubuntu/_base/kdewebdev/debian/kimagemapeditor-trinity.manpages
diff --git a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.menu b/ubuntu/_base/kdewebdev/debian/kimagemapeditor-trinity.menu
index 04b796670..04b796670 100644
--- a/ubuntu/maverick/kdewebdev/debian/kimagemapeditor-trinity.menu
+++ b/ubuntu/_base/kdewebdev/debian/kimagemapeditor-trinity.menu
diff --git a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.README.Debian b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.README.Debian
index e1c211379..e1c211379 100644
--- a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.README.Debian
+++ b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.README.Debian
diff --git a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.docs b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.docs
index c1da674ec..c1da674ec 100644
--- a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.docs
+++ b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.docs
diff --git a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.install b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.install
index f65852c45..f65852c45 100644
--- a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.install
+++ b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.install
diff --git a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.manpages b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.manpages
index 0a9e537e1..0a9e537e1 100644
--- a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.manpages
+++ b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.manpages
diff --git a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.menu b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.menu
index 742018cf6..742018cf6 100644
--- a/ubuntu/maverick/kdewebdev/debian/klinkstatus-trinity.menu
+++ b/ubuntu/_base/kdewebdev/debian/klinkstatus-trinity.menu
diff --git a/ubuntu/maverick/kdewebdev/debian/kommander-trinity-dev.docs b/ubuntu/_base/kdewebdev/debian/kommander-trinity-dev.docs
index 2ea0142a2..2ea0142a2 100644
--- a/ubuntu/maverick/kdewebdev/debian/kommander-trinity-dev.docs
+++ b/ubuntu/_base/kdewebdev/debian/kommander-trinity-dev.docs
diff --git a/ubuntu/maverick/kdewebdev/debian/kommander-trinity-dev.install b/ubuntu/_base/kdewebdev/debian/kommander-trinity-dev.install
index 54d904432..54d904432 100644
--- a/ubuntu/maverick/kdewebdev/debian/kommander-trinity-dev.install
+++ b/ubuntu/_base/kdewebdev/debian/kommander-trinity-dev.install
diff --git a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.README.Debian b/ubuntu/_base/kdewebdev/debian/kommander-trinity.README.Debian
index 2b4b6e2a1..2b4b6e2a1 100644
--- a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.README.Debian
+++ b/ubuntu/_base/kdewebdev/debian/kommander-trinity.README.Debian
diff --git a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.docs b/ubuntu/_base/kdewebdev/debian/kommander-trinity.docs
index 2ea0142a2..2ea0142a2 100644
--- a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.docs
+++ b/ubuntu/_base/kdewebdev/debian/kommander-trinity.docs
diff --git a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.install b/ubuntu/_base/kdewebdev/debian/kommander-trinity.install
index a95d024c1..a95d024c1 100644
--- a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.install
+++ b/ubuntu/_base/kdewebdev/debian/kommander-trinity.install
diff --git a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.manpages b/ubuntu/_base/kdewebdev/debian/kommander-trinity.manpages
index 718a10f1e..718a10f1e 100644
--- a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.manpages
+++ b/ubuntu/_base/kdewebdev/debian/kommander-trinity.manpages
diff --git a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.menu b/ubuntu/_base/kdewebdev/debian/kommander-trinity.menu
index 7b7a2de10..7b7a2de10 100644
--- a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.menu
+++ b/ubuntu/_base/kdewebdev/debian/kommander-trinity.menu
diff --git a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.shlibs b/ubuntu/_base/kdewebdev/debian/kommander-trinity.shlibs
index 92ae6b607..92ae6b607 100644
--- a/ubuntu/maverick/kdewebdev/debian/kommander-trinity.shlibs
+++ b/ubuntu/_base/kdewebdev/debian/kommander-trinity.shlibs
diff --git a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.README.Debian b/ubuntu/_base/kdewebdev/debian/kxsldbg-trinity.README.Debian
index 23c2e7507..23c2e7507 100644
--- a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.README.Debian
+++ b/ubuntu/_base/kdewebdev/debian/kxsldbg-trinity.README.Debian
diff --git a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.install b/ubuntu/_base/kdewebdev/debian/kxsldbg-trinity.install
index 84fec5328..84fec5328 100644
--- a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.install
+++ b/ubuntu/_base/kdewebdev/debian/kxsldbg-trinity.install
diff --git a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.manpages b/ubuntu/_base/kdewebdev/debian/kxsldbg-trinity.manpages
index c56e17491..c56e17491 100644
--- a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.manpages
+++ b/ubuntu/_base/kdewebdev/debian/kxsldbg-trinity.manpages
diff --git a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.menu b/ubuntu/_base/kdewebdev/debian/kxsldbg-trinity.menu
index d9d4957f7..d9d4957f7 100644
--- a/ubuntu/maverick/kdewebdev/debian/kxsldbg-trinity.menu
+++ b/ubuntu/_base/kdewebdev/debian/kxsldbg-trinity.menu
diff --git a/ubuntu/maverick/kdewebdev/debian/man/extractkmdr-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/extractkmdr-trinity.1
index 7f00356e8..7f00356e8 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/extractkmdr-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/extractkmdr-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/man/kfilereplace-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/kfilereplace-trinity.1
index 2f8d0acd2..2f8d0acd2 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/kfilereplace-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/kfilereplace-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/man/kimagemapeditor-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/kimagemapeditor-trinity.1
index 03642502b..03642502b 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/kimagemapeditor-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/kimagemapeditor-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/man/klinkstatus-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/klinkstatus-trinity.1
index 1daabcd15..1daabcd15 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/klinkstatus-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/klinkstatus-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/man/kmdr-editor-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/kmdr-editor-trinity.1
index 0af0743be..0af0743be 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/kmdr-editor-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/kmdr-editor-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/man/kmdr-executor-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/kmdr-executor-trinity.1
index a21a84158..a21a84158 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/kmdr-executor-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/kmdr-executor-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/man/kmdr-plugins-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/kmdr-plugins-trinity.1
index 4a75aad57..4a75aad57 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/kmdr-plugins-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/kmdr-plugins-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/man/kmdr2po-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/kmdr2po-trinity.1
index 5d2b23d3e..5d2b23d3e 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/kmdr2po-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/kmdr2po-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/man/kxsldbg-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/kxsldbg-trinity.1
index 9f7d11155..9f7d11155 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/kxsldbg-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/kxsldbg-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/man/quanta-trinity.1 b/ubuntu/_base/kdewebdev/debian/man/quanta-trinity.1
index a127d1c68..a127d1c68 100644
--- a/ubuntu/maverick/kdewebdev/debian/man/quanta-trinity.1
+++ b/ubuntu/_base/kdewebdev/debian/man/quanta-trinity.1
diff --git a/ubuntu/maverick/kdewebdev/debian/patches/common/README b/ubuntu/_base/kdewebdev/debian/patches/common/README
index 01a880c08..01a880c08 100644
--- a/ubuntu/maverick/kdewebdev/debian/patches/common/README
+++ b/ubuntu/_base/kdewebdev/debian/patches/common/README
diff --git a/ubuntu/maverick/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
index 1f825f642..1f825f642 100644
--- a/ubuntu/maverick/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/_base/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/ubuntu/maverick/kdewebdev/debian/patches/series b/ubuntu/_base/kdewebdev/debian/patches/series
index 8f8f0bd6b..8f8f0bd6b 100644
--- a/ubuntu/maverick/kdewebdev/debian/patches/series
+++ b/ubuntu/_base/kdewebdev/debian/patches/series
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.README.Debian b/ubuntu/_base/kdewebdev/debian/quanta-data-trinity.README.Debian
index b64da44cf..b64da44cf 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.README.Debian
+++ b/ubuntu/_base/kdewebdev/debian/quanta-data-trinity.README.Debian
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.docs b/ubuntu/_base/kdewebdev/debian/quanta-data-trinity.docs
index 39f0afb3c..39f0afb3c 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.docs
+++ b/ubuntu/_base/kdewebdev/debian/quanta-data-trinity.docs
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.install b/ubuntu/_base/kdewebdev/debian/quanta-data-trinity.install
index d02d0d9c7..d02d0d9c7 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.install
+++ b/ubuntu/_base/kdewebdev/debian/quanta-data-trinity.install
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.lintian b/ubuntu/_base/kdewebdev/debian/quanta-data-trinity.lintian
index 1b1814f88..1b1814f88 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.lintian
+++ b/ubuntu/_base/kdewebdev/debian/quanta-data-trinity.lintian
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.README.Debian b/ubuntu/_base/kdewebdev/debian/quanta-trinity.README.Debian
index eed8069b3..eed8069b3 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.README.Debian
+++ b/ubuntu/_base/kdewebdev/debian/quanta-trinity.README.Debian
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.docs b/ubuntu/_base/kdewebdev/debian/quanta-trinity.docs
index 39f0afb3c..39f0afb3c 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.docs
+++ b/ubuntu/_base/kdewebdev/debian/quanta-trinity.docs
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.install b/ubuntu/_base/kdewebdev/debian/quanta-trinity.install
index 7b3618363..7b3618363 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.install
+++ b/ubuntu/_base/kdewebdev/debian/quanta-trinity.install
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.links b/ubuntu/_base/kdewebdev/debian/quanta-trinity.links
index a512db79b..a512db79b 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.links
+++ b/ubuntu/_base/kdewebdev/debian/quanta-trinity.links
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.lintian b/ubuntu/_base/kdewebdev/debian/quanta-trinity.lintian
index f46ec301f..f46ec301f 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.lintian
+++ b/ubuntu/_base/kdewebdev/debian/quanta-trinity.lintian
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.manpages b/ubuntu/_base/kdewebdev/debian/quanta-trinity.manpages
index e4b4a816c..e4b4a816c 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.manpages
+++ b/ubuntu/_base/kdewebdev/debian/quanta-trinity.manpages
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.menu b/ubuntu/_base/kdewebdev/debian/quanta-trinity.menu
index 1d0a29249..1d0a29249 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.menu
+++ b/ubuntu/_base/kdewebdev/debian/quanta-trinity.menu
diff --git a/ubuntu/maverick/kdewebdev/debian/rules b/ubuntu/_base/kdewebdev/debian/rules
index 9cbfc111e..9cbfc111e 100755
--- a/ubuntu/maverick/kdewebdev/debian/rules
+++ b/ubuntu/_base/kdewebdev/debian/rules
diff --git a/ubuntu/maverick/kdewebdev/debian/source/format b/ubuntu/_base/kdewebdev/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/kdewebdev/debian/source/format
+++ b/ubuntu/_base/kdewebdev/debian/source/format
diff --git a/ubuntu/maverick/kdewebdev/debian/source/options b/ubuntu/_base/kdewebdev/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/kdewebdev/debian/source/options
+++ b/ubuntu/_base/kdewebdev/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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 20dc96c92..20dc96c92 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 759418bea..759418bea 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 c7200473e..c7200473e 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 834db7ba0..834db7ba0 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 623855d60..623855d60 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 4320c81d2..4320c81d2 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 bbc6f0d96..bbc6f0d96 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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 df8c34427..df8c34427 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 60174829a..60174829a 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/libkexiv2/debian/watch b/ubuntu/_base/libraries/libkexiv2/debian/watch
index 781107196..781107196 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/watch
+++ b/ubuntu/_base/libraries/libkexiv2/debian/watch
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 092b0090a..092b0090a 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 e47e24f8c..e47e24f8c 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 75c9add4b..75c9add4b 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 8759c69c0..8759c69c0 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 5e5ea207b..5e5ea207b 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 a211719ab..a211719ab 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 ee0b9c258..ee0b9c258 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/libkipi/debian/watch b/ubuntu/_base/libraries/libkipi/debian/watch
index a913b7d89..a913b7d89 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/watch
+++ b/ubuntu/_base/libraries/libkipi/debian/watch
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 25be3857f..25be3857f 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 7541dd795..7541dd795 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 e247609bf..e247609bf 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 18a60f11f..18a60f11f 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/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/mlt++/debian/README.Debian b/ubuntu/_base/libraries/mlt++/debian/README.Debian
index 3afa8664c..3afa8664c 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/README.Debian
+++ b/ubuntu/_base/libraries/mlt++/debian/README.Debian
diff --git a/ubuntu/maverick/libraries/mlt++/debian/changelog b/ubuntu/_base/libraries/mlt++/debian/changelog
index 981452ad7..981452ad7 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/changelog
+++ b/ubuntu/_base/libraries/mlt++/debian/changelog
diff --git a/ubuntu/maverick/libraries/mlt++/debian/compat b/ubuntu/_base/libraries/mlt++/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/compat
+++ b/ubuntu/_base/libraries/mlt++/debian/compat
diff --git a/ubuntu/maverick/libraries/mlt++/debian/control b/ubuntu/_base/libraries/mlt++/debian/control
index 0e2213288..0e2213288 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/control
+++ b/ubuntu/_base/libraries/mlt++/debian/control
diff --git a/ubuntu/maverick/libraries/mlt++/debian/copyright b/ubuntu/_base/libraries/mlt++/debian/copyright
index 974ccd34b..974ccd34b 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/copyright
+++ b/ubuntu/_base/libraries/mlt++/debian/copyright
diff --git a/ubuntu/maverick/libraries/mlt++/debian/libmlt++-trinity-dev.files b/ubuntu/_base/libraries/mlt++/debian/libmlt++-trinity-dev.files
index 18ce6b959..18ce6b959 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/libmlt++-trinity-dev.files
+++ b/ubuntu/_base/libraries/mlt++/debian/libmlt++-trinity-dev.files
diff --git a/ubuntu/maverick/libraries/mlt++/debian/rules b/ubuntu/_base/libraries/mlt++/debian/rules
index cd87c6cce..cd87c6cce 100755
--- a/ubuntu/maverick/libraries/mlt++/debian/rules
+++ b/ubuntu/_base/libraries/mlt++/debian/rules
diff --git a/ubuntu/maverick/libraries/mlt++/debian/source/format b/ubuntu/_base/libraries/mlt++/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/source/format
+++ b/ubuntu/_base/libraries/mlt++/debian/source/format
diff --git a/ubuntu/maverick/libraries/mlt++/debian/source/options b/ubuntu/_base/libraries/mlt++/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/source/options
+++ b/ubuntu/_base/libraries/mlt++/debian/source/options
diff --git a/ubuntu/maverick/libraries/mlt++/debian/watch b/ubuntu/_base/libraries/mlt++/debian/watch
index 1349d4e90..1349d4e90 100644
--- a/ubuntu/maverick/libraries/mlt++/debian/watch
+++ b/ubuntu/_base/libraries/mlt++/debian/watch
diff --git a/ubuntu/maverick/libraries/mlt/debian/changelog b/ubuntu/_base/libraries/mlt/debian/changelog
index c1226d47e..c1226d47e 100644
--- a/ubuntu/maverick/libraries/mlt/debian/changelog
+++ b/ubuntu/_base/libraries/mlt/debian/changelog
diff --git a/ubuntu/maverick/libraries/mlt/debian/compat b/ubuntu/_base/libraries/mlt/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/mlt/debian/compat
+++ b/ubuntu/_base/libraries/mlt/debian/compat
diff --git a/ubuntu/maverick/libraries/mlt/debian/control b/ubuntu/_base/libraries/mlt/debian/control
index fcc4989c8..fcc4989c8 100644
--- a/ubuntu/maverick/libraries/mlt/debian/control
+++ b/ubuntu/_base/libraries/mlt/debian/control
diff --git a/ubuntu/maverick/libraries/mlt/debian/copyright b/ubuntu/_base/libraries/mlt/debian/copyright
index a95008a7d..a95008a7d 100644
--- a/ubuntu/maverick/libraries/mlt/debian/copyright
+++ b/ubuntu/_base/libraries/mlt/debian/copyright
diff --git a/ubuntu/maverick/libraries/mlt/debian/libmiracle0.2.5-trinity.install b/ubuntu/_base/libraries/mlt/debian/libmiracle0.2.5-trinity.install
index 41bd5918b..41bd5918b 100644
--- a/ubuntu/maverick/libraries/mlt/debian/libmiracle0.2.5-trinity.install
+++ b/ubuntu/_base/libraries/mlt/debian/libmiracle0.2.5-trinity.install
diff --git a/ubuntu/maverick/libraries/mlt/debian/libmlt-dev.manpages b/ubuntu/_base/libraries/mlt/debian/libmlt-dev.manpages
index fe9b9ccbb..fe9b9ccbb 100644
--- a/ubuntu/maverick/libraries/mlt/debian/libmlt-dev.manpages
+++ b/ubuntu/_base/libraries/mlt/debian/libmlt-dev.manpages
diff --git a/ubuntu/maverick/libraries/mlt/debian/libmlt-trinity-dev.install b/ubuntu/_base/libraries/mlt/debian/libmlt-trinity-dev.install
index b634111fb..b634111fb 100644
--- a/ubuntu/maverick/libraries/mlt/debian/libmlt-trinity-dev.install
+++ b/ubuntu/_base/libraries/mlt/debian/libmlt-trinity-dev.install
diff --git a/ubuntu/maverick/libraries/mlt/debian/libmlt0.2.5-trinity.install b/ubuntu/_base/libraries/mlt/debian/libmlt0.2.5-trinity.install
index 8640103cf..8640103cf 100644
--- a/ubuntu/maverick/libraries/mlt/debian/libmlt0.2.5-trinity.install
+++ b/ubuntu/_base/libraries/mlt/debian/libmlt0.2.5-trinity.install
diff --git a/ubuntu/maverick/libraries/mlt/debian/libvalerie0.2.5-trinity.install b/ubuntu/_base/libraries/mlt/debian/libvalerie0.2.5-trinity.install
index b2ee6434c..b2ee6434c 100644
--- a/ubuntu/maverick/libraries/mlt/debian/libvalerie0.2.5-trinity.install
+++ b/ubuntu/_base/libraries/mlt/debian/libvalerie0.2.5-trinity.install
diff --git a/ubuntu/maverick/libraries/mlt/debian/mlt-config.1 b/ubuntu/_base/libraries/mlt/debian/mlt-config.1
index 9e700d957..9e700d957 100644
--- a/ubuntu/maverick/libraries/mlt/debian/mlt-config.1
+++ b/ubuntu/_base/libraries/mlt/debian/mlt-config.1
diff --git a/ubuntu/maverick/libraries/mlt/debian/patches/.gitignore b/ubuntu/_base/libraries/mlt/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/mlt/debian/patches/.gitignore
+++ b/ubuntu/_base/libraries/mlt/debian/patches/.gitignore
diff --git a/ubuntu/maverick/libraries/mlt/debian/rules b/ubuntu/_base/libraries/mlt/debian/rules
index 80bbbcdc7..80bbbcdc7 100755
--- a/ubuntu/maverick/libraries/mlt/debian/rules
+++ b/ubuntu/_base/libraries/mlt/debian/rules
diff --git a/ubuntu/maverick/libraries/mlt/debian/source/format b/ubuntu/_base/libraries/mlt/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/mlt/debian/source/format
+++ b/ubuntu/_base/libraries/mlt/debian/source/format
diff --git a/ubuntu/maverick/libraries/mlt/debian/source/options b/ubuntu/_base/libraries/mlt/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/mlt/debian/source/options
+++ b/ubuntu/_base/libraries/mlt/debian/source/options
diff --git a/ubuntu/maverick/libraries/mlt/debian/watch b/ubuntu/_base/libraries/mlt/debian/watch
index 4dcc9e900..4dcc9e900 100644
--- a/ubuntu/maverick/libraries/mlt/debian/watch
+++ b/ubuntu/_base/libraries/mlt/debian/watch
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/README.Debian b/ubuntu/_base/libraries/pykdeextensions/debian/README.Debian
index b0302c211..b0302c211 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/README.Debian
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/README.Debian
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog b/ubuntu/_base/libraries/pykdeextensions/debian/changelog
index aa3b5a07d..aa3b5a07d 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/changelog
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/changelog
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/compat b/ubuntu/_base/libraries/pykdeextensions/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/compat
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/compat
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/control b/ubuntu/_base/libraries/pykdeextensions/debian/control
index a6d9cfd00..a6d9cfd00 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/control
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/control
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/copyright b/ubuntu/_base/libraries/pykdeextensions/debian/copyright
index a90a21587..a90a21587 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/copyright
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/copyright
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/docs b/ubuntu/_base/libraries/pykdeextensions/debian/docs
index e845566c0..e845566c0 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/docs
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/docs
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/_base/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install
index f50fc4e15..f50fc4e15 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/libpythonize0-trinity-dev.install
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity.install b/ubuntu/_base/libraries/pykdeextensions/debian/libpythonize0-trinity.install
index 48601d2d0..48601d2d0 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/libpythonize0-trinity.install
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/libpythonize0-trinity.install
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/.gitignore b/ubuntu/_base/libraries/pykdeextensions/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/.gitignore
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/patches/.gitignore
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/11_fix_get_libdir_name.diff b/ubuntu/_base/libraries/pykdeextensions/debian/patches/11_fix_get_libdir_name.diff
index 2a5eb9bc8..2a5eb9bc8 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/patches/11_fix_get_libdir_name.diff
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/series b/ubuntu/_base/libraries/pykdeextensions/debian/patches/series
index 4e4c2c945..4e4c2c945 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/patches/series
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/patches/series
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pycompat b/ubuntu/_base/libraries/pykdeextensions/debian/pycompat
index 0cfbf0888..0cfbf0888 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/pycompat
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/pycompat
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install b/ubuntu/_base/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
index 3bbebee2f..3bbebee2f 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/pykdeextensions-trinity.install
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides b/ubuntu/_base/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
index 71fc709f5..71fc709f5 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/python-distutils-jaunty.mk b/ubuntu/_base/libraries/pykdeextensions/debian/python-distutils-jaunty.mk
index db329306c..db329306c 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/python-distutils-jaunty.mk
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/python-distutils-jaunty.mk
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pyversions b/ubuntu/_base/libraries/pykdeextensions/debian/pyversions
index b3dc41ebc..b3dc41ebc 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/pyversions
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/pyversions
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/rules b/ubuntu/_base/libraries/pykdeextensions/debian/rules
index 8be5e322e..8be5e322e 100755
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/rules
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/rules
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/source/format b/ubuntu/_base/libraries/pykdeextensions/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/source/format
+++ b/ubuntu/_base/libraries/pykdeextensions/debian/source/format
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/source/options b/ubuntu/_base/libraries/pykdeextensions/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/libraries/pykdeextensions/debian/source/options
+++ b/ubuntu/_base/libraries/pykdeextensions/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 48f8d4dae..48f8d4dae 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 c8a35e82b..c8a35e82b 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/pykdeconfig.py b/ubuntu/_base/libraries/python-trinity/debian/pykdeconfig.py
index 9e3840afe..9e3840afe 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/pykdeconfig.py
+++ b/ubuntu/_base/libraries/python-trinity/debian/pykdeconfig.py
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.dirs b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-doc.dirs
index 8c23689f0..8c23689f0 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.dirs
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-doc.dirs
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.doc-base b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-doc.doc-base
index 58c6a2651..58c6a2651 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.doc-base
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-doc.doc-base
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.examples b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-doc.examples
index e39721e20..e39721e20 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.examples
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-doc.examples
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-doc.install
index 146aeabc5..146aeabc5 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/python-trinity-doc.install
+++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-doc.install
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 7b0c03e54..7b0c03e54 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.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 f1546efe6..f1546efe6 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/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 9ded53d05..9ded53d05 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 89ae9db8f..89ae9db8f 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/casper-trinity/scripts/casper-bottom/15autologin-trinity b/ubuntu/_base/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity
index a018471b7..a018471b7 100755
--- a/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity
+++ b/ubuntu/_base/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity
diff --git a/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity b/ubuntu/_base/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity
index bd764edcc..bd764edcc 100755
--- a/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity
+++ b/ubuntu/_base/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/COPYING b/ubuntu/_base/metapackages/kubuntu-meta/COPYING
index d511905c1..d511905c1 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/COPYING
+++ b/ubuntu/_base/metapackages/kubuntu-meta/COPYING
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/README b/ubuntu/_base/metapackages/kubuntu-meta/README
index 357d51105..357d51105 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/README
+++ b/ubuntu/_base/metapackages/kubuntu-meta/README
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/changelog b/ubuntu/_base/metapackages/kubuntu-meta/debian/changelog
index fe6fb96ce..fe6fb96ce 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 43efd153f..43efd153f 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/rules b/ubuntu/_base/metapackages/kubuntu-meta/debian/rules
index 2b69924b8..2b69924b8 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 89ae9db8f..89ae9db8f 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/kubuntu-meta/debootstrap-version b/ubuntu/_base/metapackages/kubuntu-meta/debootstrap-version
index b0f3d96f8..b0f3d96f8 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debootstrap-version
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debootstrap-version
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop b/ubuntu/_base/metapackages/kubuntu-meta/desktop
index 99927929d..99927929d 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/_base/metapackages/kubuntu-meta/desktop-amd64
index c85ba2cb7..c85ba2cb7 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-amd64
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/_base/metapackages/kubuntu-meta/desktop-hppa
index 0622e54d3..0622e54d3 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-hppa
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/_base/metapackages/kubuntu-meta/desktop-i386
index dcca4f896..dcca4f896 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-i386
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/_base/metapackages/kubuntu-meta/desktop-ia64
index 6b914b3b2..6b914b3b2 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-ia64
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/_base/metapackages/kubuntu-meta/desktop-lpia
index b3894e901..b3894e901 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-lpia
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/_base/metapackages/kubuntu-meta/desktop-powerpc
index 7490dac2a..7490dac2a 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-powerpc
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64 b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-amd64
index 954395d33..954395d33 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-amd64
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-hppa
index 5a4bea656..5a4bea656 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-hppa
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386 b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-i386
index b7c9bea64..b7c9bea64 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-i386
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64 b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-ia64
index dda138ee3..dda138ee3 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-ia64
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-lpia
index 90d564170..90d564170 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-lpia
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-powerpc
index caf564463..caf564463 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-powerpc
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-sparc
index 0aa3a1fb1..0aa3a1fb1 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-recommends-sparc
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/_base/metapackages/kubuntu-meta/desktop-sparc
index 0622e54d3..0622e54d3 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc
+++ b/ubuntu/_base/metapackages/kubuntu-meta/desktop-sparc
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/update b/ubuntu/_base/metapackages/kubuntu-meta/update
index 01998e1bc..01998e1bc 100755
--- a/ubuntu/maverick/metapackages/kubuntu-meta/update
+++ b/ubuntu/_base/metapackages/kubuntu-meta/update
diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/update.cfg b/ubuntu/_base/metapackages/kubuntu-meta/update.cfg
index ee2975a4f..ee2975a4f 100644
--- a/ubuntu/maverick/metapackages/kubuntu-meta/update.cfg
+++ b/ubuntu/_base/metapackages/kubuntu-meta/update.cfg
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/Makefile b/ubuntu/_base/metapackages/sudo-trinity/Makefile
index bc4653675..bc4653675 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/Makefile
+++ b/ubuntu/_base/metapackages/sudo-trinity/Makefile
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 e9314525c..e9314525c 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/rules b/ubuntu/_base/metapackages/sudo-trinity/debian/rules
index f8c89d5db..f8c89d5db 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 89ae9db8f..89ae9db8f 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/sudo-trinity/etc/sudoers.d/tde-secure-path b/ubuntu/_base/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
+++ b/ubuntu/_base/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/changelog b/ubuntu/_base/metapackages/trinity-keyring/changelog
index eca44f384..eca44f384 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/changelog
+++ b/ubuntu/_base/metapackages/trinity-keyring/changelog
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/changelog b/ubuntu/_base/metapackages/trinity-keyring/debian/changelog
index ffc944ffb..ffc944ffb 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 c61c58fba..c61c58fba 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/postinst b/ubuntu/_base/metapackages/trinity-keyring/debian/postinst
index fa0073eba..fa0073eba 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/postinst
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/postinst
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/prerm b/ubuntu/_base/metapackages/trinity-keyring/debian/prerm
index 4af539bb3..4af539bb3 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/prerm
+++ b/ubuntu/_base/metapackages/trinity-keyring/debian/prerm
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules b/ubuntu/_base/metapackages/trinity-keyring/debian/rules
index 8695ad9dc..8695ad9dc 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/keyrings/trinity-keyring.gpg b/ubuntu/_base/metapackages/trinity-keyring/keyrings/trinity-keyring.gpg
index d703b13cc..d703b13cc 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/keyrings/trinity-keyring.gpg
+++ b/ubuntu/_base/metapackages/trinity-keyring/keyrings/trinity-keyring.gpg
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/md5sums.txt b/ubuntu/_base/metapackages/trinity-keyring/md5sums.txt
index f65dfc593..f65dfc593 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/md5sums.txt
+++ b/ubuntu/_base/metapackages/trinity-keyring/md5sums.txt
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/repositories/trinity.list b/ubuntu/_base/metapackages/trinity-keyring/repositories/trinity.list
index 25c3e39da..25c3e39da 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/repositories/trinity.list
+++ b/ubuntu/_base/metapackages/trinity-keyring/repositories/trinity.list
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 71e504eb1..71e504eb1 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 89ae9db8f..89ae9db8f 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/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 9ded53d05..9ded53d05 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 89ae9db8f..89ae9db8f 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/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity b/ubuntu/_base/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
index e31165c02..e31165c02 100755
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
+++ b/ubuntu/_base/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
diff --git a/ubuntu/bionic b/ubuntu/bionic
new file mode 120000
index 000000000..e7c887a6f
--- /dev/null
+++ b/ubuntu/bionic
@@ -0,0 +1 @@
+_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/natty b/ubuntu/natty
deleted file mode 120000
index 5cb6e6000..000000000
--- a/ubuntu/natty
+++ /dev/null
@@ -1 +0,0 @@
-maverick
\ No newline at end of file
diff --git a/ubuntu/oneiric b/ubuntu/oneiric
deleted file mode 120000
index 5cb6e6000..000000000
--- a/ubuntu/oneiric
+++ /dev/null
@@ -1 +0,0 @@
-maverick
\ 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
deleted file mode 120000
index 5cb6e6000..000000000
--- a/ubuntu/quantal
+++ /dev/null
@@ -1 +0,0 @@
-maverick
\ No newline at end of file
diff --git a/ubuntu/raring b/ubuntu/raring
deleted file mode 120000
index 5cb6e6000..000000000
--- a/ubuntu/raring
+++ /dev/null
@@ -1 +0,0 @@
-maverick
\ No newline at end of file
diff --git a/ubuntu/trusty b/ubuntu/trusty
new file mode 120000
index 000000000..e7c887a6f
--- /dev/null
+++ b/ubuntu/trusty
@@ -0,0 +1 @@
+_base
\ No newline at end of file
diff --git a/ubuntu/xenial b/ubuntu/xenial
new file mode 120000
index 000000000..e7c887a6f
--- /dev/null
+++ b/ubuntu/xenial
@@ -0,0 +1 @@
+_base
\ No newline at end of file